Skip to content

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

工作台

parent 22b50b90
Hide whitespace changes
Inline Side-by-side
Showing with 196 additions and 179 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/HygfRouthTypeEnum.java
View file @ ed9bddcb
......@@ -13,6 +13,7 @@ public enum HygfRouthTypeEnum {
HYGF_REPAY("hygf_repayment", "还款"),
HYGF_DZKC("hygf_dzkc", "电站勘察"),
HYGF_DSG("hygf_dsg", "待施工"),
HYGF_HTTB("hygf_httb", "合同填报"),
;
private final String code;
......
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 @ ed9bddcb
......@@ -190,8 +190,8 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
}
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(basicGridRecord.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.验收管理.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.验收管理.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.验收管理.getCode(), basicGridRecord.getPeasantHouseholdId(), taskName, orgCode,routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksService.addToDoTasksByUserIds(userIds,toDoTasks);
......@@ -270,8 +270,8 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
}
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(basicGridAuditing.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
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);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksService.completeAndAddToDoTask(userIds,toDoTasks,"");
......
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 @ ed9bddcb
......@@ -270,8 +270,8 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
}
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(grid.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.并网管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.并网管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.并网管理.getCode(), grid.getPeasantHouseholdId(), taskName, orgCode,routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksService.addToDoTasksByUserIds(userIds,toDoTasks);
......@@ -532,8 +532,8 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
}
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(basicGridAuditing.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
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);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksService.completeAndAddToDoTask(userIds,toDoTasks,"");
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/DealerReviewServiceImpl.java
View file @ ed9bddcb
......@@ -91,8 +91,8 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
//添加待办
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(dealerReview.getUnitInfoId()));
String routhPath = toDoTasksService.getRouthPath(dealerReview.getNextProcessNode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(dealerReview.getNextProcessNode(), routhPathVO);
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.经销商审核.getCode(),dealerReview.getNextProcessNode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.经销商审核.getCode(),dealerReview.getNextProcessNode(), routhPathVO);
ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.经销商审核.getCode(), dealerReview.getUnitInfoId(), "经销商"+ name +"待经销商审核", regionalCompaniesCode, routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-管理员");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(null, roleId);
......
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 @ ed9bddcb
......@@ -233,8 +233,8 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
}
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(peasantHousehold.getSequenceNbr()));
String routhPath = toDoTasksService.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.投融资管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.投融资管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.投融资管理.getCode(), peasantHousehold.getSequenceNbr(), taskName, orgCode,routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksService.addToDoTasksByUserIds(userIds,toDoTasks);
......@@ -382,8 +382,8 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
}
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(financingAuditing.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.投融资管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.投融资管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.投融资管理.getCode(), peasantHousehold.getSequenceNbr(), taskName,orgCode,routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksService.completeAndAddToDoTask(userIds,toDoTasks,"");
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PeasantHouseholdServiceImpl.java
View file @ ed9bddcb
......@@ -204,8 +204,8 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
todoUserIds.add(peasantHousehold.getDeveloperUserId());
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(peasantHousehold.getSequenceNbr()));
String routhPath = toDoTasksServiceImpl.getRouthPath(HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.电站勘察.getCode(),HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.电站勘察.getCode(),HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.电站勘察.getCode(), peasantHousehold.getSequenceNbr(), "用户"+householdContract.getPartyA()+"电站信息勘察",householdContract.getDealerCode(),routhPath,wxRouthPath);
toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks);
......@@ -965,12 +965,16 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
todoUserIds.add(peasantHousehold.getDeveloperUserId());
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(peasantHousehold.getSequenceNbr()));
String routhPath = toDoTasksServiceImpl.getRouthPath(HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.电站勘察.getCode(), HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.电站勘察.getCode(), HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.电站勘察.getCode(), peasantHousehold.getSequenceNbr(), "用户"+householdContract.getPartyA()+"电站信息勘察",householdContract.getDealerCode(),routhPath,wxRouthPath);
toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.合同填报.getCode(), householdContract.getSequenceNbr(), "用户"+householdContract.getPartyA()+"的合同待发起",householdContract.getDealerCode());
RouthPathVO routhPathVO1 = new RouthPathVO();
routhPathVO1.setRouthPathId(String.valueOf(peasantHousehold.getSequenceNbr()));
String routhPath1 = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.合同填报.getCode(), HygfRouthTypeEnum.HYGF_HTTB.getCode(), routhPathVO1);
String wxRouthPath1 = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.合同填报.getCode(), HygfRouthTypeEnum.HYGF_HTTB.getCode(), routhPathVO1);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.合同填报.getCode(), householdContract.getSequenceNbr(), "用户"+householdContract.getPartyA()+"的合同待发起",householdContract.getDealerCode(),routhPath1,wxRouthPath1);
toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java
View file @ ed9bddcb
......@@ -229,8 +229,8 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
PeasantHousehold peasantHousehold = peasantHouseholdService.getById(powerStation.getPeasantHouseholdId());
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(powerStation.getSequenceNbr()));
String routhPath = toDoTasksServiceImpl.getRouthPath(powerStation.getNextProcessNode(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(powerStation.getNextProcessNode(), routhPathVO);
String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.电站审核.getCode(),powerStation.getNextProcessNode(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.电站审核.getCode(),powerStation.getNextProcessNode(), routhPathVO);
if (PowerStationNodeEnum.经销商确认.getCode().equals(powerStationNodeEnum.getCode())) {
ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.电站审核.getCode(), powerStation.getSequenceNbr(), "用户" + name + "电站勘察待" + powerStationNodeEnum.getName(), peasantHousehold.getDeveloperCode(),routhPath,wxRouthPath);
List<String> userIds = new ArrayList<>();
......
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 @ ed9bddcb
......@@ -672,8 +672,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
//发起待办
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(model.getSequenceNbr()));
String routhPath = toDoTasksServiceImpl.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.发货管理.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.发货管理.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.发货管理.getCode(), model.getSequenceNbr(), "下单人"+model.getOrderUser()+"发货待确认",model.getRegionalCompaniesCode(),routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksServiceImpl.completeAndAddToDoTask(userIds,toDoTasks,"");
......@@ -773,8 +773,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
//发起待办
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(model.getSequenceNbr()));
String routhPath = toDoTasksServiceImpl.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.发货管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.发货管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.发货管理.getCode(), model.getSequenceNbr(), "下单人"+model.getOrderUser()+"发货待确认",model.getRegionalCompaniesCode(),routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksServiceImpl.addToDoTasksByUserIds(userIds,toDoTasks);
......@@ -1053,8 +1053,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
//更新待办
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(preparationMoney.getSequenceNbr()));
String routhPath = toDoTasksServiceImpl.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
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(), "下单人"+preparationMoney.getOrderUser()+"发货"+preparationMoney.getOrderStatus(),preparationMoney.getRegionalCompaniesCode(),routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksServiceImpl.completeAndAddToDoTask(userIds,toDoTasks,"");
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/RepaymentServiceImpl.java
View file @ ed9bddcb
......@@ -169,8 +169,8 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
//生成待办
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(repayment.getSequenceNbr()));
String routhPath = toDoTasksService.getRouthPath(HygfRouthTypeEnum.HYGF_REPAY.getCode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(HygfRouthTypeEnum.HYGF_REPAY.getCode(), routhPathVO);
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.还款.getCode(),HygfRouthTypeEnum.HYGF_REPAY.getCode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.还款.getCode(),HygfRouthTypeEnum.HYGF_REPAY.getCode(), routhPathVO);
ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.还款.getCode(), repayment.getSequenceNbr(), createTaskName(repayment), repayment.getRegionalCompaniesCode(), routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-投融");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(repayment.getRegionalCompaniesCode(), roleId);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/ToDoTasksServiceImpl.java
View file @ ed9bddcb
......@@ -313,33 +313,33 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T
* @param amosDealerId
* @return
*/
public List<String> getTodoUserIds(String companyOrgCode,String roleId,String amosDealerId){
public List<String> getTodoUserIds(String companyOrgCode, String roleId, String amosDealerId) {
if (StringUtils.isNotEmpty(companyOrgCode)) {
companyOrgCode = "%" + companyOrgCode + "%";
}
if (StringUtils.isNotEmpty(roleId)) {
roleId = "%" + roleId + "%";
}
return toDoTasksMapper.getTodoUserIdsByAmosDealer(companyOrgCode, roleId,amosDealerId);
return toDoTasksMapper.getTodoUserIdsByAmosDealer(companyOrgCode, roleId, amosDealerId);
}
//获取路由地址
public String getRouthPath(String type, Object model) {
public String getRouthPath(String taskType, String key, Object model) {
List<Map> urlList = JsonUtils.getResourceList(urlInfo);
return getRouthPath(type, urlList, model);
return getRouthPath(taskType, key, urlList, model);
}
//获取微信路由地址
public String getWxRouthPath(String type, Object model) {
public String getWxRouthPath(String taskType, String key, Object model) {
List<Map> urlList = JsonUtils.getResourceList(wxUrlInfo);
return getRouthPath(type, urlList, model);
return getRouthPath(taskType, key, urlList, model);
}
private String getRouthPath(String type, List<Map> urlList, Object model) {
private String getRouthPath(String taskType, String key, List<Map> urlList, Object model) {
String routhPath = "";
try {
for (Map map : urlList) {
if (map.get("type").equals(type)) {
if (map.get("taskType").equals(taskType) && map.get("key").equals(key)) {
routhPath = map.get("url").toString();
if (StringUtils.isNotEmpty(routhPath)) {
// 检查 URL 是否已有参数
......
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 @ ed9bddcb
......@@ -218,8 +218,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
//新增待办
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(model.getSequenceNbr()));
String routhPath = toDoTasksService.getRouthPath(HygfRouthTypeEnum.HYGF_DSG.getCode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(HygfRouthTypeEnum.HYGF_DSG.getCode(), routhPathVO);
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.派工发料.getCode(), HygfRouthTypeEnum.HYGF_DSG.getCode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.派工发料.getCode(), HygfRouthTypeEnum.HYGF_DSG.getCode(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.派工发料.getCode(), model.getSequenceNbr(), "有一个派单编号"+model.getWorkOrderNum()+"待施工",model.getRegionCode(),routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-经销商-施工");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(model.getRegionCode(), roleId, String.valueOf(model.getAmosDealerId()));
......@@ -399,8 +399,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
}
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(powerStationConstructionData.getWorkOrderPowerStationId()));
String routhPath = toDoTasksService.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.施工完工.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.施工完工.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.施工完工.getCode(), powerStationConstructionData.getWorkOrderPowerStationId(), taskName, regionalCompaniesCode,routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksService.addToDoTasksByUserIds(userIds,toDoTasks);
......@@ -559,8 +559,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
}
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(hygfWorkOrderStationAuditing.getWorkOrderPowerStationId()));
String routhPath = toDoTasksService.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.施工完工.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.施工完工.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.施工完工.getCode(), hygfWorkOrderStationAuditing.getWorkOrderPowerStationId(), taskName,regionalCompaniesCode,routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksService.completeAndAddToDoTask(userIds,toDoTasks,"");
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/json/hygfRouth.json
View file @ ed9bddcb
[
{
"type": "jxs_03",
"pageType": "",
"key": "jxs_03",
"taskType": "经销商审核",
"name": "经销商管理员审核",
"url": "/mixuap?appId=1678340647909617665&id=1678365817248444417"
},
{
"type": "hygf_dzkc",
"pageType": "",
"key": "hygf_dzkc",
"taskType": "电站勘察",
"name": "电站勘察",
"url": "/mixuap?appId=1677158789557547009&id=1678284514217979905"
},
{
"type": "hygf_02",
"pageType": "",
"key": "hygf_02",
"taskType": "电站审核",
"name": "经销商确认",
"url": "/mixuap?appId=1677158789557547009&id=1783749877520404481"
},
{
"type": "hygf_03",
"pageType": "",
"key": "hygf_03",
"taskType": "电站审核",
"name": "设计审核",
"url": "/mixuap?appId=1678340647909617665&id=1784391744234721281"
},
{
"type": "hygf_05",
"pageType": "",
"key": "hygf_05",
"taskType": "电站审核",
"name": "投融审核",
"url": "/mixuap?appId=1678340647909617665&id=1784391744234721281"
},
{
"type": "hygf_07",
"pageType": "",
"key": "hygf_07",
"taskType": "电站审核",
"name": "法务审核",
"url": "/mixuap?appId=1678340647909617665&id=1784391744234721281"
},
{
"type": "hygf_09",
"pageType": "",
"key": "hygf_09",
"taskType": "电站审核",
"name": "设计上传典型图库",
"url": "/mixuap?appId=1678340647909617665&id=1784391744234721281"
},
{
"type": "hygf_10",
"pageType": "",
"key": "hygf_10",
"taskType": "电站审核",
"name": "经销商设计人员上传设计图",
"url": "/mixuap?appId=1677158789557547009&id=1783750128415281153"
},
{
"type": "hygf_11",
"pageType": "",
"key": "hygf_11",
"taskType": "电站审核",
"name": "设计图纸审核",
"url": "/mixuap?appId=1678340647909617665&id=1784391744234721281"
},
{
"type": "fh_dtj",
"pageType": "",
"key": "hygf_httb",
"taskType": "合同填报",
"name": "合同填报",
"url": "/view/mine/minepage/SurveyListgld"
},
{
"key": "fh_dtj",
"taskType": "发货管理",
"name": "待发货",
"url": "/mixuap?appId=1678340647909617665&id=1802911589028859905"
},
{
"type": "fh_dyr",
"pageType": "",
"key": "fh_dyr",
"taskType": "发货管理",
"name": "待确认",
"url": "/mixuap?appId=1677158789557547009&id=1808437079118450689"
},
{
"type": "fh_dsh",
"pageType": "",
"key": "fh_dsh",
"taskType": "发货管理",
"name": "待审核",
"url": "/mixuap?appId=1678340647909617665&id=1784391442173530113"
},
{
"type": "fh_sqbh",
"pageType": "",
"key": "fh_sqbh",
"taskType": "发货管理",
"name": "申请补货",
"url": "/mixuap?appId=1677158789557547009&id=1808437079118450689"
},
{
"type": "hygf_dsg",
"pageType": "",
"key": "hygf_dsg",
"taskType": "派工发料",
"name": "待施工",
"url": ""
},
{
"type": "Activity_0bs6t4g",
"pageType": "",
"key": "Activity_0bs6t4g",
"taskType": "施工完工",
"name": "施工完成提交",
"url": ""
},
{
"type": "Activity_1spujef",
"pageType": "",
"key": "Activity_1spujef",
"taskType": "施工完工",
"name": "完工登记提交",
"url": "/mixuap?appId=1677158789557547009&id=1742435340745994242"
},
{
"type": "Activity_16r1828",
"pageType": "",
"key": "Activity_16r1828",
"taskType": "施工完工",
"name": "完工自审",
"url": "/mixuap?appId=1677158789557547009&id=1742435400158310401"
},
{
"type": "Activity_1bldcno",
"pageType": "",
"key": "Activity_1bldcno",
"taskType": "施工完工",
"name": "完工自审-片区运营中心",
"url": "/mixuap?appId=1678340647909617665&id=1823622039500492802"
},
{
"type": "Activity_1yftt2k",
"pageType": "",
"key": "Activity_1yftt2k",
"taskType": "施工完工",
"name": "工程审核",
"url": "/mixuap?appId=1678340647909617665&id=1823622039500492802"
},
{
"type": "Activity_095if3p",
"pageType": "",
"key": "Activity_095if3p",
"taskType": "施工完工",
"name": "设计审核",
"url": "/mixuap?appId=1678340647909617665&id=1823622039500492802"
},
{
"type": "Activity_0bs6t4g",
"pageType": "",
"key": "Activity_0bs6t4g",
"taskType": "并网管理",
"name": "并网登记提交",
"url": "/mixuap?appId=1677158789557547009&id=1747137335817957378"
},
{
"type": "Activity_0r2x1es",
"pageType": "",
"key": "Activity_0r2x1es",
"taskType": "并网管理",
"name": "经销商管理审核",
"url": "/mixuap?appId=1677158789557547009&id=1747137335817957378"
},
{
"type": "Activity_05nlkey",
"pageType": "",
"key": "Activity_05nlkey",
"taskType": "并网管理",
"name": "片区审核",
"url": "/mixuap?appId=1678340647909617665&id=1827892888785129474"
},
{
"type": "Activity_0k4o46e",
"pageType": "",
"key": "Activity_0k4o46e",
"taskType": "并网管理",
"name": "设计审核/工程审核",
"url": "/mixuap?appId=1678340647909617665&id=1827892888785129474"
},
{
"type": "Activity_0bs6t4g",
"pageType": "",
"key": "Activity_0bs6t4g",
"taskType": "验收管理",
"name": "验收提交",
"url": "/mixuap?appId=1677158789557547009&id=1828973864328105986"
},
{
"type": "Activity_0ojajec",
"pageType": "",
"key": "Activity_0ojajec",
"taskType": "验收管理",
"name": "经销商管理员审核",
"url": "/mixuap?appId=1677158789557547009&id=1828973864328105986"
},
{
"type": "Activity_0edftmv",
"pageType": "",
"key": "Activity_0edftmv",
"taskType": "验收管理",
"name": "片区审核",
"url": "/mixuap?appId=1678340647909617665&id=1828979740128579585"
},
{
"type": "Activity_1rjn5s1",
"pageType": "",
"key": "Activity_1rjn5s1",
"taskType": "验收管理",
"name": "投融/法务审核",
"url": "/mixuap?appId=1678340647909617665&id=1828979740128579585"
},
{
"type": "Activity_0rbc0gc",
"pageType": "",
"key": "Activity_0rbc0gc",
"taskType": "验收管理",
"name": "资产审核",
"url": "/mixuap?appId=1678340647909617665&id=1828979740128579585"
},
{
"type": "AbarbeitungWaitPush",
"pageType": "",
"key": "AbarbeitungWaitPush",
"taskType": "投融资管理",
"name": "推送融资",
"url": "/mixuap?appId=1677158789557547009&id=1776873272973987842"
},
{
"type": "WaitAbarbeitung",
"pageType": "",
"key": "WaitAbarbeitung",
"taskType": "投融资管理",
"name": "经销商重新提交验收/退回建档",
"url": "/mixuap?appId=1677158789557547009&id=1776873272973987842"
},
{
"type": "FinancingAudit",
"pageType": "",
"key": "FinancingAudit",
"taskType": "投融资管理",
"name": "融资审核",
"url": "/mixuap?appId=1678340647909617665&id=1774974009419501569"
},
{
"type": "AuditPass",
"pageType": "",
"key": "AuditPass",
"taskType": "投融资管理",
"name": "放款确认",
"url": "/mixuap?appId=1678340647909617665&id=1831226627237875713"
},
{
"type": "hygf_repayment",
"pageType": "",
"key": "hygf_repayment",
"taskType": "还款",
"name": "还款管理",
"url": "/mixuap?appId=1678340647909617665&id=1846106343904120833"
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/json/wxHygfRouth.json
View file @ ed9bddcb
[
{
"type": "jxs_03",
"pageType": "",
"key": "jxs_03",
"taskType": "经销商审核",
"name": "经销商管理员审核",
"url": ""
},
{
"type": "hygf_dzkc",
"pageType": "",
"key": "hygf_dzkc",
"taskType": "电站勘察",
"name": "电站勘察",
"url": "/view/mine/minepage/PeasantManage"
},
{
"type": "hygf_02",
"pageType": "",
"key": "hygf_02",
"taskType": "电站审核",
"name": "经销商确认",
"url": "/view/mine/minepage/SurveyList"
},
{
"type": "hygf_03",
"pageType": "",
"key": "hygf_03",
"taskType": "电站审核",
"name": "设计审核",
"url": "/view/mine/minepage/SurveyListgld"
},
{
"type": "hygf_05",
"pageType": "",
"key": "hygf_05",
"taskType": "电站审核",
"name": "投融审核",
"url": "/view/mine/minepage/SurveyListgld"
},
{
"type": "hygf_07",
"pageType": "",
"key": "hygf_07",
"taskType": "电站审核",
"name": "法务审核",
"url": "/view/mine/minepage/SurveyListgld"
},
{
"type": "hygf_09",
"pageType": "",
"key": "hygf_09",
"taskType": "电站审核",
"name": "设计上传典型图库",
"url": "/view/mine/minepage/SurveyListgld"
},
{
"type": "hygf_10",
"pageType": "",
"key": "hygf_10",
"taskType": "电站审核",
"name": "经销商设计人员上传设计图",
"url": "/view/mine/minepage/SurveyList"
},
{
"type": "hygf_11",
"pageType": "",
"key": "hygf_11",
"taskType": "电站审核",
"name": "设计图纸审核",
"url": "/view/mine/minepage/SurveyListgld"
},
{
"type": "fh_dtj",
"pageType": "",
"key": "hygf_httb",
"taskType": "合同填报",
"name": "合同填报",
"url": "/view/mine/minepage/SurveyListgld"
},
{
"key": "fh_dtj",
"taskType": "发货管理",
"name": "待发货",
"url": ""
},
{
"type": "fh_dyr",
"pageType": "",
"key": "fh_dyr",
"taskType": "发货管理",
"name": "待确认",
"url": "/view/mine/subPackageA/menus/shippingOrder/shippingOrderList/index"
},
{
"type": "fh_dsh",
"pageType": "",
"key": "fh_dsh",
"taskType": "发货管理",
"name": "待审核",
"url": "/view/mine/subPackageA/menus/shippingOrder/shippingOrderList/index"
},
{
"type": "fh_sqbh",
"pageType": "",
"key": "fh_sqbh",
"taskType": "发货管理",
"name": "申请补货",
"url": "/view/mine/subPackageA/menus/shippingOrder/shippingOrderList/index"
},
{
"type": "hygf_dsg",
"pageType": "",
"key": "hygf_dsg",
"taskType": "派工发料",
"name": "待施工",
"url": ""
},
{
"type": "Activity_0bs6t4g",
"pageType": "",
"key": "Activity_0bs6t4g",
"taskType": "施工完工",
"name": "施工完成提交",
"url": "/view/mine/sggl/SgglList"
},
{
"type": "Activity_1spujef",
"pageType": "",
"key": "Activity_1spujef",
"taskType": "施工完工",
"name": "完工登记提交",
"url": "/view/mine/wgdj/WgdjList"
},
{
"type": "Activity_16r1828",
"pageType": "",
"key": "Activity_16r1828",
"taskType": "施工完工",
"name": "完工自审",
"url": "/view/mine/wgzs/WgzsList"
},
{
"type": "Activity_1bldcno",
"pageType": "",
"key": "Activity_1bldcno",
"taskType": "施工完工",
"name": "完工自审-片区运营中心",
"url": "/view/mine/subPackageA/menus/constructionAcceptance/index"
},
{
"type": "Activity_1yftt2k",
"pageType": "",
"key": "Activity_1yftt2k",
"taskType": "施工完工",
"name": "工程审核",
"url": "/view/mine/subPackageA/menus/constructionAcceptance/index"
},
{
"type": "Activity_095if3p",
"pageType": "",
"key": "Activity_095if3p",
"taskType": "施工完工",
"name": "设计审核",
"url": "/view/mine/subPackageA/menus/constructionAcceptance/index"
},
{
"type": "Activity_0bs6t4g",
"pageType": "",
"key": "Activity_0bs6t4g",
"taskType": "并网管理",
"name": "并网登记提交",
"url": "/view/mine/bwgl/BwglList"
},
{
"type": "Activity_0r2x1es",
"pageType": "",
"key": "Activity_0r2x1es",
"taskType": "并网管理",
"name": "经销商管理审核",
"url": "/view/mine/bwgl/BwglList"
},
{
"type": "Activity_05nlkey",
"pageType": "",
"key": "Activity_05nlkey",
"taskType": "并网管理",
"name": "片区审核",
"url": "/view/mine/subPackageA/menus/onGridAcceptance/index"
},
{
"type": "Activity_0k4o46e",
"pageType": "",
"key": "Activity_0k4o46e",
"taskType": "并网管理",
"name": "设计审核/工程审核",
"url": "/view/mine/subPackageA/menus/onGridAcceptance/index"
},
{
"type": "Activity_0bs6t4g",
"pageType": "",
"key": "Activity_0bs6t4g",
"taskType": "验收管理",
"name": "验收提交",
"url": "/view/mine/subPackageA/menus/acceptanceCheck/ysgl"
},
{
"type": "Activity_0ojajec",
"pageType": "",
"key": "Activity_0ojajec",
"taskType": "验收管理",
"name": "经销商管理员审核",
"url": "/view/mine/subPackageA/menus/acceptanceCheck/ysgl"
},
{
"type": "Activity_0edftmv",
"pageType": "",
"key": "Activity_0edftmv",
"taskType": "验收管理",
"name": "片区审核",
"url": "/view/mine/subPackageA/menus/acceptanceCheck/index"
},
{
"type": "Activity_1rjn5s1",
"pageType": "",
"key": "Activity_1rjn5s1",
"taskType": "验收管理",
"name": "投融/法务审核",
"url": "/view/mine/subPackageA/menus/acceptanceCheck/index"
},
{
"type": "Activity_0rbc0gc",
"pageType": "",
"key": "Activity_0rbc0gc",
"taskType": "验收管理",
"name": "资产审核",
"url": "/view/mine/subPackageA/menus/acceptanceCheck/index"
},
{
"type": "AbarbeitungWaitPush",
"pageType": "",
"key": "AbarbeitungWaitPush",
"taskType": "投融资管理",
"name": "推送融资",
"url": "/view/mine/subPackageA/InvestmentAndFinancing/investment/index"
},
{
"type": "WaitAbarbeitung",
"pageType": "",
"key": "WaitAbarbeitung",
"taskType": "投融资管理",
"name": "经销商重新提交验收/退回建档",
"url": "/view/mine/subPackageA/menus/acceptanceCheck/ysgl"
},
{
"type": "FinancingAudit",
"pageType": "",
"key": "FinancingAudit",
"taskType": "投融资管理",
"name": "融资审核",
"url": "/view/mine/subPackageA/InvestmentAndFinancing/financing/index"
},
{
"type": "AuditPass",
"pageType": "",
"key": "AuditPass",
"taskType": "投融资管理",
"name": "放款确认",
"url": "/view/mine/subPackageA/InvestmentAndFinancing/investment/index"
},
{
"type": "hygf_repayment",
"pageType": "",
"key": "hygf_repayment",
"taskType": "还款",
"name": "还款管理",
"url": ""
}
......
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