Skip to content

A
amos-boot-biz
Commit 2dbb86a8 authored by tangwei's avatar tangwei
Browse files
Options

修改并网审核

parent 4e193a07
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 34 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/BasicGridAcceptanceDto.java
View file @ 2dbb86a8
......@@ -73,5 +73,5 @@ public class BasicGridAcceptanceDto extends BaseDto {
//并网登记id
private Long fOnGridId;
private Long fonGridId;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/StartProcessDto.java
View file @ 2dbb86a8
......@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
import lombok.Data;
import java.util.List;
/**
* @description:
* @author: tw
......@@ -9,5 +11,5 @@ import lombok.Data;
*/
@Data
public class StartProcessDto {
private ProcessDto process;
private List<ProcessDto> process;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HygfOnGrid.java
View file @ 2dbb86a8
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
......@@ -97,12 +98,14 @@ public class HygfOnGrid extends BaseEntity {
/**
* 合同到期时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField("contract_expiration_date")
private Date contractExpirationDate;
/**
* 有效发电开始日
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField("effective_power_generation_start_date")
private Date effectivePowerGenerationStartDate;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridAcceptanceMapper.xml
View file @ 2dbb86a8
......@@ -14,7 +14,7 @@
<select id="selectPageList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto">
SELECT
hogaa.sequence_nbr fOnGridId,
hogaa.sequence_nbr fonGridId,
hbga.sequence_nbr sequenceNbr,
hbga.work_order_id workOrderId,
hbga.work_order_power_station_id workOrderPowerStationId,
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/BasicGridAcceptanceController.java
View file @ 2dbb86a8
......@@ -66,8 +66,8 @@ public class BasicGridAcceptanceController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel save(@RequestBody Map<String, HygfOnGrid> model) {
HygfOnGrid dto = model.get("HygfOnGridInfo");
public ResponseModel save(@RequestBody HygfOnGrid dto) {
return ResponseHelper.buildResponse(basicGridAcceptanceServiceImpl.saveEntity(dto));
}
......@@ -79,8 +79,7 @@ public class BasicGridAcceptanceController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save/commit")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel saveAndCommit(@RequestBody Map<String, HygfOnGrid> model) {
HygfOnGrid dto = model.get("HygfOnGridInfo");
public ResponseModel saveAndCommit(@RequestBody HygfOnGrid dto) {
return ResponseHelper.buildResponse(basicGridAcceptanceServiceImpl.saveAndCommit(dto));
}
......@@ -160,15 +159,14 @@ public class BasicGridAcceptanceController extends BaseController {
@ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询")
public ResponseModel<Page<BasicGridAcceptanceDto>> queryForCheckPage(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
@RequestParam(value = "projectAddress") String projectAddress,
@RequestParam(value = "powerStationCode") String powerStationCode,
@RequestParam(value = "ownersName") String ownersName,
@RequestParam(value = "gridStatus") String gridStatus,
@RequestParam(value = "gridConnectionTime") Date gridConnectionTime) {
@RequestParam(required = false,value = "projectAddress") String projectAddress,
@RequestParam(required = false,value = "powerStationCode") String powerStationCode,
@RequestParam(required = false,value = "ownersName") String ownersName,
@RequestParam(required = false,value = "gridStatus") String gridStatus,
@RequestParam(required = false,value = "gridConnectionTime") Date gridConnectionTime) {
//当前登录人所属场站
UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
Page<BasicGridAcceptanceDto> page = basicGridAcceptanceServiceImpl.selectPage(userUnitInformationDto.getRegionalCompaniesSeq(),userUnitInformationDto.getAmosDealerId(),current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "check");
Page<BasicGridAcceptanceDto> page = basicGridAcceptanceServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "check");
return ResponseHelper.buildResponse(page);
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/feign/WorkflowFeignClient.java
View file @ 2dbb86a8
......@@ -72,7 +72,7 @@ public interface WorkflowFeignClient {
*是否需要自定执行第一个任务节点
* */
@RequestMapping(value = "/v2/task/start/batch", method = RequestMethod.POST)
FeignClientResult<ProcessTaskDTO> startProcess(@RequestBody StartProcessDto startProcessDto);
FeignClientResult<List<ProcessTaskDTO>> startProcess(@RequestBody StartProcessDto startProcessDto);
......@@ -92,7 +92,7 @@ public interface WorkflowFeignClient {
*
* */
@RequestMapping(value = "/v2/task/complete/standard/{taskId}", method = RequestMethod.POST)
FeignClientResult<ProcessTaskDTO> standard( @PathVariable(value = "taskId") String taskId ,@RequestBody StandardDto standardDto);
FeignClientResult<List<ProcessTaskDTO>> standard( @PathVariable(value = "taskId") String taskId ,@RequestBody StandardDto standardDto);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BasicGridAcceptanceServiceImpl.java
View file @ 2dbb86a8
......@@ -62,30 +62,36 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
}
public HygfOnGrid saveEntity(HygfOnGrid grid) {
HygfOnGrid onGrid = new HygfOnGrid();
BeanUtils.copyProperties(grid, onGrid);
onGridMapper.insert(onGrid);
BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper.selectOne(new LambdaQueryWrapper<BasicGridAcceptance>().eq(BasicGridAcceptance::getWorkOrderPowerStationId, grid.getWorkOrderPowerStationId()));
basicGridAcceptance.setGridStatus(GridStatusEnum.DDJ.getCode());
basicGridAcceptanceMapper.updateById(basicGridAcceptance);
return onGrid;
}
if(grid.getSequenceNbr()!=null){
onGridMapper.updateById(grid);
}else{
onGridMapper.insert(grid);
}
return grid;
}
@Transactional
public HygfOnGrid saveAndCommit(HygfOnGrid grid) {
HygfOnGrid onGrid = new HygfOnGrid();
BeanUtils.copyProperties(grid, onGrid);
onGridMapper.insert(onGrid);
BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper.selectOne(new LambdaQueryWrapper<BasicGridAcceptance>().eq(BasicGridAcceptance::getWorkOrderPowerStationId, grid.getWorkOrderPowerStationId()));
basicGridAcceptance.setGridStatus(GridStatusEnum.DSH.getCode());
// 调用工作流执行第一个节点
ProcessDto processDto = new ProcessDto();
processDto.setBusinessKey(String.valueOf(basicGridAcceptance.getSequenceNbr()));
StartProcessDto startProcessDto = new StartProcessDto();
startProcessDto.setProcess(processDto);
List<ProcessDto> process=new ArrayList<>();
process.add(processDto);
startProcessDto.setProcess(process);
BasicGridAcceptance workBasicGridAcceptance = workflow.startProcess(basicGridAcceptance, startProcessDto);
BeanUtils.copyProperties(workBasicGridAcceptance, basicGridAcceptance);
if(grid.getSequenceNbr()!=null){
onGridMapper.updateById(grid);
}else{
onGridMapper.insert(grid);
}
basicGridAcceptanceMapper.updateById(basicGridAcceptance);
return onGrid;
return grid;
}
public HygfOnGrid modifyEntity(HygfOnGrid grid) {
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkflowImpl.java
View file @ 2dbb86a8
......@@ -42,7 +42,7 @@ public class WorkflowImpl {
public BasicGridAcceptance startProcess(BasicGridAcceptance basicGridAcceptance,StartProcessDto startProcessDto){
FeignClientResult<ProcessTaskDTO> json= workflowFeignClient.startProcess(startProcessDto);
FeignClientResult<List<ProcessTaskDTO>> json= workflowFeignClient.startProcess(startProcessDto);
basicGridAcceptance= this.getBasicGridAcceptance(basicGridAcceptance,json);
return basicGridAcceptance;
}
......@@ -54,17 +54,18 @@ public class WorkflowImpl {
* */
public BasicGridAcceptance standard(BasicGridAcceptance basicGridAcceptance,StandardDto standardDto){
FeignClientResult<ProcessTaskDTO> json= workflowFeignClient.standard(standardDto.getTaskId(),standardDto);
FeignClientResult<List<ProcessTaskDTO>> json= workflowFeignClient.standard(standardDto.getTaskId(),standardDto);
basicGridAcceptance= this.getBasicGridAcceptance(basicGridAcceptance,json);
return basicGridAcceptance;
}
public BasicGridAcceptance getBasicGridAcceptance(BasicGridAcceptance basicGridAcceptance,FeignClientResult<ProcessTaskDTO> json){
public BasicGridAcceptance getBasicGridAcceptance(BasicGridAcceptance basicGridAcceptance,FeignClientResult<List<ProcessTaskDTO>> json){
if (!ObjectUtils.isEmpty(json)) {
if (json.getStatus() == 200) {
ProcessTaskDTO listco = json.getResult();
List<ProcessTaskDTO> lis = json.getResult();
ProcessTaskDTO listco= lis.get(0);
if(listco!=null){
/**
* 工作流实例ID
......@@ -84,7 +85,17 @@ public class WorkflowImpl {
}
/// 下一个节点角色权限
if(listco.getNextCandidateGroups()!=null){
basicGridAcceptance.setNextExecutorIds(JSON.toJSONString(listco.getNextCandidateGroups().get(basicGridAcceptance.getNextTaskId())));
List<String> ld= listco.getNextCandidateGroups().get(basicGridAcceptance.getNextTaskId());
StringBuffer sbf = new StringBuffer();
for(int i=0;i<=ld.size()-1;i++){
if(i<ld.size()-1){
sbf.append(ld.get(i) + ",");
}else {
sbf.append(ld.get(i));
}
}
basicGridAcceptance.setNextExecutorIds(sbf.toString());
}
//下一节点可执行人逗号分割 0 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment