Skip to content

A
amos-boot-zx-biz
Commit 8bba9270 authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

工作台

parent 18d01c2a
Show whitespace changes
Inline Side-by-side
Showing with 75 additions and 28 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/JpStationMapper.java
View file @ 8bba9270
...@@ -97,4 +97,7 @@ public interface JpStationMapper extends BaseMapper<JpStation> { ...@@ -97,4 +97,7 @@ public interface JpStationMapper extends BaseMapper<JpStation> {
List<Map<String, String>> queryCompany(@Param("companyType") String companyType); List<Map<String, String>> queryCompany(@Param("companyType") String companyType);
List<JpStationDto> queryStation(@Param("dto") JpStationDto reviewDto); List<JpStationDto> queryStation(@Param("dto") JpStationDto reviewDto);
List<Map<String, String>> queryUnitInfo();
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml
View file @ 8bba9270
...@@ -868,5 +868,11 @@ ...@@ -868,5 +868,11 @@
order by rec_date DESC order by rec_date DESC
</select> </select>
<select id="queryUnitInfo" resultType="java.util.Map">
SELECT amos_company_code value, name
FROM hygf_unit_info
WHERE is_delete = 0 and amos_company_code is not null
</select>
</mapper> </mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java
View file @ 8bba9270
...@@ -861,6 +861,13 @@ public class JpStationController extends BaseController { ...@@ -861,6 +861,13 @@ public class JpStationController extends BaseController {
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/queryUnitInfo")
@ApiOperation(httpMethod = "GET", value = "查询经销商", notes = "查询经销商")
public ResponseModel<List<Map<String, String>>> queryUnitInfo() {
List<Map<String, String>> map = jpStationServiceImpl.queryUnitInfo();
return ResponseHelper.buildResponse(map);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getStationDetail") @GetMapping(value = "/getStationDetail")
@ApiOperation(httpMethod = "GET", value = "查询场站详情", notes = "查询场站详情") @ApiOperation(httpMethod = "GET", value = "查询场站详情", notes = "查询场站详情")
public ResponseModel<JpStationDto> getStationDetail(@RequestParam(value = "sequenceNbr") Long sequenceNbr) { public ResponseModel<JpStationDto> getStationDetail(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceCheckServiceImpl.java
View file @ 8bba9270
...@@ -265,14 +265,18 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A ...@@ -265,14 +265,18 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
acceptanceCheckAuditingService.createWithModel(basicGridAuditingDto); acceptanceCheckAuditingService.createWithModel(basicGridAuditingDto);
if(BusinessWorkflowKey.法务审核.getCode().equals(taskKey)){ if(BusinessWorkflowKey.法务审核.getCode().equals(taskKey)){
//完成法务 //完成法务
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridAuditing.getPeasantHouseholdId()); ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_YSFWSH.getBusiness());
toDoTasksService.completeToDoTasks(toDoTasks1,""); toDoTasksService.completeToDoTasks(toDoTasks1,"");
} }
if(BusinessWorkflowKey.投融审核.getCode().equals(taskKey)){ if(BusinessWorkflowKey.投融审核.getCode().equals(taskKey)){
//完成投融 //完成投融
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridAuditing.getPeasantHouseholdId()); ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_YSTRSH.getBusiness());
toDoTasksService.completeToDoTasks(toDoTasks1,""); toDoTasksService.completeToDoTasks(toDoTasks1,"");
} }
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(basicGridAuditing.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.验收.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.验收.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO);
if("Activity_1rjn5s1".equals(workflowResultDto.getNextNodeKey())){ if("Activity_1rjn5s1".equals(workflowResultDto.getNextNodeKey())){
//完成待办 //完成待办
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridAuditing.getPeasantHouseholdId()); ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridAuditing.getPeasantHouseholdId());
...@@ -285,26 +289,19 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A ...@@ -285,26 +289,19 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
taskName= peasantHousehold.getOwnersName() ; taskName= peasantHousehold.getOwnersName() ;
orgCode=peasantHousehold.getRegionalCompaniesCode(); orgCode=peasantHousehold.getRegionalCompaniesCode();
} }
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(basicGridAuditing.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.验收.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.验收.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
//投融 //投融
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridAuditing.getPeasantHouseholdId(), taskName+ "待投融审核",orgCode,routhPath,wxRouthPath); ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_YSTRSH.getBusiness(), taskName+ "待投融审核",orgCode,routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-投融"); String roleId = toDoTasksService.getRoleIdByName("户用光伏-投融");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(orgCode, roleId); List<String> todoUserIds = toDoTasksService.getTodoUserIds(orgCode, roleId);
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks); toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks);
//法务 //法务
ToDoTasks toDoTasks2= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridAuditing.getPeasantHouseholdId(), taskName+ "待法务审核",orgCode,routhPath,wxRouthPath); ToDoTasks toDoTasks2= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_YSFWSH.getBusiness(), taskName+ "待法务审核",orgCode,routhPath,wxRouthPath);
String roleId1 = toDoTasksService.getRoleIdByName("户用光伏-法务"); String roleId1 = toDoTasksService.getRoleIdByName("户用光伏-法务");
List<String> todoUserIds1 = toDoTasksService.getTodoUserIds(orgCode, roleId1); List<String> todoUserIds1 = toDoTasksService.getTodoUserIds(orgCode, roleId1);
toDoTasksService.addToDoTasksByUserIds(todoUserIds1,toDoTasks2); toDoTasksService.addToDoTasksByUserIds(todoUserIds1,toDoTasks2);
}else if("Activity_0bs6t4g".equals(workflowResultDto.getNextNodeKey())){ }else if("Activity_0bs6t4g".equals(workflowResultDto.getNextNodeKey())){
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridAuditing.getPeasantHouseholdId()); PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridAuditing.getPeasantHouseholdId());
RouthPathVO routhPathVO = new RouthPathVO();
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.验收.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.验收.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridAuditing.getPeasantHouseholdId(), peasantHousehold.getOwnersName()+"待"+workflowResultDto.getNextNodeName(),peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath); ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridAuditing.getPeasantHouseholdId(), peasantHousehold.getOwnersName()+"待"+workflowResultDto.getNextNodeName(),peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-经销商-工程"); String roleId = toDoTasksService.getRoleIdByName("户用光伏-经销商-工程");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId); List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId);
...@@ -319,10 +316,6 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A ...@@ -319,10 +316,6 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
taskName=peasantHousehold.getOwnersName() + "待" +workflowResultDto.getNextNodeName(); taskName=peasantHousehold.getOwnersName() + "待" +workflowResultDto.getNextNodeName();
orgCode=peasantHousehold.getRegionalCompaniesCode(); orgCode=peasantHousehold.getRegionalCompaniesCode();
} }
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(basicGridAuditing.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.验收.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.验收.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridAuditing.getPeasantHouseholdId(), taskName,orgCode,routhPath,wxRouthPath); ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridAuditing.getPeasantHouseholdId(), taskName,orgCode,routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(",")); List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.验收.getCode(), workflowResultDto.getNextNodeKey(),userIds, orgCode, peasantHousehold.getDeveloperCode()); List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.验收.getCode(), workflowResultDto.getNextNodeKey(),userIds, orgCode, peasantHousehold.getDeveloperCode());
...@@ -409,7 +402,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A ...@@ -409,7 +402,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
up.set(AcceptanceCheck::getBasicGridNode,"ys-tourong"); up.set(AcceptanceCheck::getBasicGridNode,"ys-tourong");
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.TRDSH.getCode()); up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.TRDSH.getCode());
//完成法务 //完成法务
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridRecord.getPeasantHouseholdId()); ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_YSFWSH.getBusiness());
toDoTasksService.completeToDoTasks(toDoTasks1,""); toDoTasksService.completeToDoTasks(toDoTasks1,"");
}else if( null == basicGridRecord.getPowerStationFinancingStatus() && approvalStatus.equals("0") && basicGridRecord.getRectificationStatus() .contains("ys-tourong") ) { }else if( null == basicGridRecord.getPowerStationFinancingStatus() && approvalStatus.equals("0") && basicGridRecord.getRectificationStatus() .contains("ys-tourong") ) {
up.set(AcceptanceCheck::getBasicGridNode,"ys-tourong"); up.set(AcceptanceCheck::getBasicGridNode,"ys-tourong");
...@@ -443,7 +436,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A ...@@ -443,7 +436,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu"); up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu");
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.FWDSH.getCode()); up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.FWDSH.getCode());
//完成投融 //完成投融
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridRecord.getPeasantHouseholdId()); ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_YSTRSH.getBusiness());
toDoTasksService.completeToDoTasks(toDoTasks1,""); toDoTasksService.completeToDoTasks(toDoTasks1,"");
}else if( null == basicGridRecord.getPowerStationLegalStatus() &&approvalStatus.equals("0") && !Objects.isNull(basicGridRecord.getRectificationStatus()) && basicGridRecord.getRectificationStatus().contains("ys-fawu") ) { }else if( null == basicGridRecord.getPowerStationLegalStatus() &&approvalStatus.equals("0") && !Objects.isNull(basicGridRecord.getRectificationStatus()) && basicGridRecord.getRectificationStatus().contains("ys-fawu") ) {
up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu"); up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu");
......
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 @ 8bba9270
...@@ -546,6 +546,10 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta ...@@ -546,6 +546,10 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), HygfRouthTypeEnum.HYGF_BWGCSH.getBusiness()); ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), HygfRouthTypeEnum.HYGF_BWGCSH.getBusiness());
toDoTasksService.completeToDoTasks(toDoTasks1,""); toDoTasksService.completeToDoTasks(toDoTasks1,"");
} }
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(basicGridAuditing.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.并网.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.并网.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
if("Activity_0k4o46e".equals(workflowResultDto.getNextNodeKey())){ if("Activity_0k4o46e".equals(workflowResultDto.getNextNodeKey())){
//完成待办 //完成待办
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), basicGridAuditing.getPeasantHouseholdId()); ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), basicGridAuditing.getPeasantHouseholdId());
...@@ -558,10 +562,6 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta ...@@ -558,10 +562,6 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
taskName= peasantHousehold.getOwnersName() ; taskName= peasantHousehold.getOwnersName() ;
orgCode=peasantHousehold.getRegionalCompaniesCode(); orgCode=peasantHousehold.getRegionalCompaniesCode();
} }
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(basicGridAuditing.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.并网.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.并网.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
//设计 //设计
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), HygfRouthTypeEnum.HYGF_BWSJSH.getBusiness(), taskName+ "待设计审核",orgCode,routhPath,wxRouthPath); ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), HygfRouthTypeEnum.HYGF_BWSJSH.getBusiness(), taskName+ "待设计审核",orgCode,routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-设计"); String roleId = toDoTasksService.getRoleIdByName("户用光伏-设计");
...@@ -583,10 +583,9 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta ...@@ -583,10 +583,9 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
taskName= peasantHousehold.getOwnersName() + "待" +workflowResultDto.getNextNodeName() ; taskName= peasantHousehold.getOwnersName() + "待" +workflowResultDto.getNextNodeName() ;
orgCode=peasantHousehold.getRegionalCompaniesCode(); orgCode=peasantHousehold.getRegionalCompaniesCode();
} }
RouthPathVO routhPathVO = new RouthPathVO(); if("Activity_0r2x1es".equals(workflowResultDto.getNextNodeKey())){
routhPathVO.setRouthPathId(String.valueOf(basicGridAuditing.getPeasantHouseholdId())); taskName= peasantHousehold.getOwnersName() + "待经销商管理员审核";
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.并网.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO); }
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.并网.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), basicGridAuditing.getPeasantHouseholdId(), taskName,orgCode,routhPath,wxRouthPath); ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), basicGridAuditing.getPeasantHouseholdId(), taskName,orgCode,routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(",")); List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.并网.getCode(), workflowResultDto.getNextNodeKey(),userIds, orgCode, peasantHousehold.getDeveloperCode()); List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.并网.getCode(), workflowResultDto.getNextNodeKey(),userIds, orgCode, peasantHousehold.getDeveloperCode());
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/FinancingInfoServiceImpl.java
View file @ 8bba9270
...@@ -408,6 +408,11 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina ...@@ -408,6 +408,11 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
String roleId = toDoTasksService.getRoleIdByName("户用光伏-融资"); String roleId = toDoTasksService.getRoleIdByName("户用光伏-融资");
List<String> userIds = toDoTasksService.getTodoUserIdsByRzjg(financingInfo.getFinancingCompaniesCode(),roleId); List<String> userIds = toDoTasksService.getTodoUserIdsByRzjg(financingInfo.getFinancingCompaniesCode(),roleId);
toDoTasksService.completeAndAddToDoTask(userIds,toDoTasks1,""); toDoTasksService.completeAndAddToDoTask(userIds,toDoTasks1,"");
} else if("WaitAbarbeitung".equals(workflowResultDto.getNextNodeKey())){
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.投融资.getCode(), peasantHousehold.getSequenceNbr(), peasantHousehold.getOwnersName()+"待经销商重新提交验收",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-经销商-工程");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId,peasantHousehold.getDeveloperCode());
toDoTasksService.completeAndAddToDoTask(todoUserIds,toDoTasks1,"");
} else { } else {
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(",")); List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.投融资.getCode(), workflowResultDto.getNextNodeKey(),userIds, orgCode, peasantHousehold.getDeveloperCode()); List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.投融资.getCode(), workflowResultDto.getNextNodeKey(),userIds, orgCode, peasantHousehold.getDeveloperCode());
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpStationServiceImpl.java
View file @ 8bba9270
...@@ -1117,4 +1117,8 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J ...@@ -1117,4 +1117,8 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
} }
return jpStationDto; return jpStationDto;
} }
public List<Map<String, String>> queryUnitInfo() {
return jpStationMapper.queryUnitInfo();
}
} }
\ No newline at end of file
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java
View file @ 8bba9270
...@@ -1148,9 +1148,33 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto ...@@ -1148,9 +1148,33 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)); List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO));
WorkflowResultDto workflowResultDto = workflowResultDtos.get(0); WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
workflowResultDto.setInstanceId(hygfPreparationMoneyAuditing.getInstanceId()); workflowResultDto.setInstanceId(hygfPreparationMoneyAuditing.getInstanceId());
//更新待办 //更新待办
// workflowResultDto.setInstanceId(preparationMoney.getInstanceId()); String taskName="";
// commonService.updateTaskModelAndAddTask(preparationMoney,workflowResultDto,BusinessTypeEnum.HYGF_FHGL); LambdaQueryWrapper<DocumentStation> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(DocumentStation::getPreparationMoneyId,preparationMoney.getSequenceNbr());
List<DocumentStation> documentStations = documentStationMapper.selectList(wrapper);
if (CollectionUtil.isNotEmpty(documentStations)){
taskName="[";
for (DocumentStation documentStation : documentStations) {
taskName= taskName + documentStation.getOwnersName() + ",";
}
taskName= taskName.substring(0,taskName.length()-1)+"]";
}
if("fh_sqbh".equals(workflowResultDto.getNextNodeKey())){
taskName= taskName + "待申请补货确认";
}else {
taskName= taskName + preparationMoney.getOrderStatus()+"收货单";
}
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(preparationMoney.getSequenceNbr()));
String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.发货.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.发货.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.发货.getCode(), preparationMoney.getSequenceNbr(), taskName,preparationMoney.getRegionalCompaniesCode(),routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
List<String> filterUsers = toDoTasksServiceImpl.filterUsers(TaskTypeStationEnum.发货.getCode(), workflowResultDto.getNextNodeKey(),userIds, preparationMoney.getRegionalCompaniesCode(), preparationMoney.getAmosUnitOrgCode());
toDoTasksServiceImpl.completeAndAddToDoTask(filterUsers,toDoTasks,"");
HygfPreparationMoneyAuditingDto preparationMoneyAuditpDto = new HygfPreparationMoneyAuditingDto(); HygfPreparationMoneyAuditingDto preparationMoneyAuditpDto = new HygfPreparationMoneyAuditingDto();
BeanUtils.copyProperties(workflowResultDto, preparationMoneyAuditpDto); BeanUtils.copyProperties(workflowResultDto, preparationMoneyAuditpDto);
preparationMoneyAuditpDto.setPreparationMoneyId(sequenceNbr); preparationMoneyAuditpDto.setPreparationMoneyId(sequenceNbr);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java
View file @ 8bba9270
...@@ -569,7 +569,12 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W ...@@ -569,7 +569,12 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
regionalCompaniesCode=workOrder.getRegionCode(); regionalCompaniesCode=workOrder.getRegionCode();
amosDealerOrgCode = workOrder.getAmosDealerOrgCode(); amosDealerOrgCode = workOrder.getAmosDealerOrgCode();
} }
String taskName = workOrderPowerStationMapper.getStationName(workOrderPowerStation.getSequenceNbr())+"待"+workflowResultDto.getNextNodeName(); String taskName ="";
if ("Activity_1bldcno".equals(workflowResultDto.getNextNodeKey())){
taskName = workOrderPowerStationMapper.getStationName(workOrderPowerStation.getSequenceNbr())+"待施工验收-片区运营审核";
}else {
taskName = workOrderPowerStationMapper.getStationName(workOrderPowerStation.getSequenceNbr())+"待"+workflowResultDto.getNextNodeName();
}
RouthPathVO routhPathVO = new RouthPathVO(); RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(hygfWorkOrderStationAuditing.getWorkOrderPowerStationId())); routhPathVO.setRouthPathId(String.valueOf(hygfWorkOrderStationAuditing.getWorkOrderPowerStationId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.施工.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO); String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.施工.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
......
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