Skip to content

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

工作台

parent db493ea7
Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 84 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 @ 18d01c2a
......@@ -20,7 +20,7 @@ public enum HygfRouthTypeEnum {
HYGF_HTQS("hygf_htqs", "合同签署",10004L),
HYGF_HTGZ("hygf_htgz", "合同盖章",10005L),
HYGF_XZFHD("fh_xzfhd", "新增发货单",10006L),
HYGF_XZPGD("hygf_xzfgd", "新增派工单",10007L),
HYGF_XZPGD("hygf_xzpgd", "新增派工单",10007L),
HYGF_XZBWDJ("bw_xzbwdj", "新增并网登记",10008L),
HYGF_XZYSTJ("ys_xzystj", "新增验收提交",10009L),
HYGF_XZTSRZ("hygf_xztsrz", "新增推送融资",10010L),
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/WorkOrderPowerStationMapper.java
View file @ 18d01c2a
......@@ -22,5 +22,5 @@ public interface WorkOrderPowerStationMapper extends BaseMapper<WorkOrderPowerSt
List<Map<String, Object>> getSgEndTime();
String getStationName(@Param("workOrderId") Long workOrderId);
String getStationName(@Param("workOrderPowerStationId") Long workOrderPowerStationId);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/WorkOrderMapper.xml
View file @ 18d01c2a
......@@ -10,8 +10,8 @@
(SELECT count(*) from hygf_work_order_power_station where hygf_work_order_power_station.work_order_id = hygf_work_order.sequence_nbr
and hygf_work_order_power_station.power_station_construction_status in ('待登记','未通过','已完工','待审核')
and (hygf_work_order_power_station.power_station_construction_status in ('待登记','未通过','已完工') or
hygf_work_order_power_station.power_station_construction_status like '%待审核%' )
) peasantHouseholdSgNum,
(
SELECT
......@@ -25,9 +25,6 @@
) as ownersName
FROM hygf_work_order
WHERE hygf_work_order.is_delete=0
<if test="dto.routhPathId != null and dto.routhPathId != ''">
and hygf_work_order.sequence_nbr = #{dto.routhPathId}
</if>
<if test="dto.workOrderNum!=null and dto.workOrderNum!=''">
and hygf_work_order.work_order_num like concat(concat('%',#{dto.workOrderNum}),'%')
</if>
......@@ -81,6 +78,7 @@
substring_index ( hygf_peasant_household.project_address_name, '/', 1 ) AS province,
hygf_work_order.work_order_num workOrderNum,
hygf_peasant_household.owners_name ownersName,
hygf_work_order_power_station.work_order_id workOrderId,
hygf_work_order.project_region_manager projectRegionManager,
hygf_work_order.construction_region_manager constructionRegionManager,
hygf_power_station_engineering_info.completion_date completionDate ,
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/WorkOrderPowerStationMapper.xml
View file @ 18d01c2a
......@@ -34,7 +34,7 @@
<select id="getStationName" resultType="java.lang.String">
SELECT GROUP_CONCAT(hph.owners_name) from hygf_work_order_power_station hwops
LEFT JOIN hygf_peasant_household hph on hph.sequence_nbr=hwops.peasant_household_id
WHERE hwops.work_order_id =#{workOrderId}
WHERE hwops.sequence_nbr =#{workOrderPowerStationId}
</select>
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/QiyuesuoController.java
View file @ 18d01c2a
......@@ -204,7 +204,7 @@ public class QiyuesuoController extends BaseController {
ToDoTasks toDoTasks1 = new ToDoTasks(TaskTypeStationEnum.合同.getCode(), householdContrac.getSequenceNbr(), householdContrac.getPartyA() + "待合同盖章", householdContrac.getRegionalCompaniesCode(),routhPath,wxRouthPath);
String roleId = toDoTasksServiceImpl.getRoleIdByName("户用光伏-工程");
List<String> todoUserIds = toDoTasksServiceImpl.getTodoUserIds(householdContrac.getRegionalCompaniesCode(), roleId);
toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds, toDoTasks);
toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds, toDoTasks1);
}
} else if ("SEAL".equals(CallbackDto.getCallbackType())) {
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/ToDoTasksController.java
View file @ 18d01c2a
......@@ -129,11 +129,11 @@ public class ToDoTasksController extends BaseController {
public ResponseModel<Map<String,Object>> count() {
String userid=getUserInfo().getUserId();
LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ToDoTasks::getAmosUserId, userid);
wrapper.like(ToDoTasks::getAmosUserId, "%"+userid+"%");
wrapper.eq(ToDoTasks::getState, "待办");
Integer DB= toDoTasksMapper.selectCount(wrapper);
LambdaQueryWrapper<ToDoTasks> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(ToDoTasks::getAmosUserId, userid);
wrapper1.like(ToDoTasks::getAmosUserId, "%"+userid+"%");
wrapper1.eq(ToDoTasks::getState, "已办");
Integer YB= toDoTasksMapper.selectCount(wrapper1);
Map<String,Object> map =new HashMap<>();
......
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 @ 18d01c2a
......@@ -180,7 +180,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
up.eq(PeasantHousehold::getSequenceNbr, idsk);
peasantHouseholdMapper.update(null, up);
//完成验收
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZYSTJ.getBusiness());
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), idsk );
toDoTasksService.completeToDoTasks(toDoTasks1,"");
//发起待办
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridRecord.getPeasantHouseholdId());
......@@ -265,12 +265,12 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
acceptanceCheckAuditingService.createWithModel(basicGridAuditingDto);
if(BusinessWorkflowKey.法务审核.getCode().equals(taskKey)){
//完成法务
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_YSFWSH.getBusiness());
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridAuditing.getPeasantHouseholdId());
toDoTasksService.completeToDoTasks(toDoTasks1,"");
}
if(BusinessWorkflowKey.投融审核.getCode().equals(taskKey)){
//完成投融
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_YSTRSH.getBusiness());
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridAuditing.getPeasantHouseholdId());
toDoTasksService.completeToDoTasks(toDoTasks1,"");
}
if("Activity_1rjn5s1".equals(workflowResultDto.getNextNodeKey())){
......@@ -290,16 +290,26 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
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_YSTRSH.getBusiness(), taskName+ "待投融审核",orgCode,routhPath,wxRouthPath);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridAuditing.getPeasantHouseholdId(), taskName+ "待投融审核",orgCode,routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-投融");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(orgCode, roleId);
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks);
//法务
ToDoTasks toDoTasks2= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_YSFWSH.getBusiness(), taskName+ "待法务审核",orgCode,routhPath,wxRouthPath);
ToDoTasks toDoTasks2= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridAuditing.getPeasantHouseholdId(), taskName+ "待法务审核",orgCode,routhPath,wxRouthPath);
String roleId1 = toDoTasksService.getRoleIdByName("户用光伏-法务");
List<String> todoUserIds1 = toDoTasksService.getTodoUserIds(orgCode, roleId1);
toDoTasksService.addToDoTasksByUserIds(todoUserIds1,toDoTasks2);
}else if("Activity_0bs6t4g".equals(workflowResultDto.getNextNodeKey())){
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);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-经销商-工程");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId);
List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.验收.getCode(), workflowResultDto.getNextNodeKey(), todoUserIds, peasantHousehold.getRegionalCompaniesCode(), peasantHousehold.getDeveloperCode());
toDoTasksService.completeAndAddToDoTask(filterUsers,toDoTasks1,"");
}else {
//更新待办
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridAuditing.getPeasantHouseholdId());
......@@ -399,7 +409,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
up.set(AcceptanceCheck::getBasicGridNode,"ys-tourong");
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.TRDSH.getCode());
//完成法务
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_YSFWSH.getBusiness());
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridRecord.getPeasantHouseholdId());
toDoTasksService.completeToDoTasks(toDoTasks1,"");
}else if( null == basicGridRecord.getPowerStationFinancingStatus() && approvalStatus.equals("0") && basicGridRecord.getRectificationStatus() .contains("ys-tourong") ) {
up.set(AcceptanceCheck::getBasicGridNode,"ys-tourong");
......@@ -433,7 +443,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu");
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.FWDSH.getCode());
//完成投融
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_YSTRSH.getBusiness());
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridRecord.getPeasantHouseholdId());
toDoTasksService.completeToDoTasks(toDoTasks1,"");
}else if( null == basicGridRecord.getPowerStationLegalStatus() &&approvalStatus.equals("0") && !Objects.isNull(basicGridRecord.getRectificationStatus()) && basicGridRecord.getRectificationStatus().contains("ys-fawu") ) {
up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu");
......@@ -491,9 +501,10 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
//生成新增投融资待办
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridRecord.getPeasantHouseholdId());
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(basicGridRecord.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.投融资.getCode(), HygfRouthTypeEnum.HYGF_XZTSRZ.getCode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.投融资.getCode(), HygfRouthTypeEnum.HYGF_XZTSRZ.getCode(), routhPathVO);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.投融资.getCode(), HygfRouthTypeEnum.HYGF_XZTSRZ.getBusiness(), peasantHousehold.getOwnersName()+"待新增推送融资",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.投融资.getCode(), basicGridRecord.getPeasantHouseholdId(), peasantHousehold.getOwnersName()+"待新增推送融资",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-投融");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId);
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
......
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 @ 18d01c2a
......@@ -251,7 +251,7 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
up.eq(PeasantHousehold::getSequenceNbr, idsk);
peasantHouseholdMapper.update(null, up);
//完成新增并网
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getBusiness());
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), idsk);
toDoTasksService.completeToDoTasks(toDoTasks1,"");
//发起待办
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(grid.getPeasantHouseholdId());
......@@ -360,9 +360,10 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
//生成验收待办
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridAcceptanc.getPeasantHouseholdId());
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(basicGridAcceptanc.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZYSTJ.getCode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZYSTJ.getCode(), routhPathVO);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZYSTJ.getBusiness(), peasantHousehold.getOwnersName()+"待新增验收提交",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridAcceptanc.getPeasantHouseholdId(), peasantHousehold.getOwnersName()+"待新增验收提交",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-经销商-工程");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId);
List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZYSTJ.getCode(), todoUserIds, peasantHousehold.getRegionalCompaniesCode(), peasantHousehold.getDeveloperCode());
......@@ -482,9 +483,10 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
//生成新增投融资待办
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridAcceptanc.getPeasantHouseholdId());
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(basicGridAcceptanc.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.投融资.getCode(), HygfRouthTypeEnum.HYGF_XZTSRZ.getCode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.投融资.getCode(), HygfRouthTypeEnum.HYGF_XZTSRZ.getCode(), routhPathVO);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.投融资.getCode(), HygfRouthTypeEnum.HYGF_XZTSRZ.getBusiness(), peasantHousehold.getOwnersName()+"待新增推送融资",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.投融资.getCode(), basicGridAcceptanc.getPeasantHouseholdId(), peasantHousehold.getOwnersName()+"待新增推送融资",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-投融");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId);
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
......@@ -686,12 +688,13 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
//生成验收待办
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridRecord.getPeasantHouseholdId());
RouthPathVO routhPathVO = new RouthPathVO();
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getCode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getCode(), routhPathVO);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getBusiness(), peasantHousehold.getOwnersName()+"待新增验收提交",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
routhPathVO.setRouthPathId(String.valueOf(basicGridRecord.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZYSTJ.getCode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZYSTJ.getCode(), routhPathVO);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridRecord.getPeasantHouseholdId(), peasantHousehold.getOwnersName()+"待新增验收提交",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-经销商-工程");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId);
List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getCode(), todoUserIds, peasantHousehold.getRegionalCompaniesCode(), peasantHousehold.getDeveloperCode());
List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZYSTJ.getCode(), todoUserIds, peasantHousehold.getRegionalCompaniesCode(), peasantHousehold.getDeveloperCode());
toDoTasksService.addToDoTasksByUserIds(filterUsers,toDoTasks1);
} else if (null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0")
......@@ -751,9 +754,10 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
//生成验收待办
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridRecord.getPeasantHouseholdId());
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(basicGridRecord.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZYSTJ.getCode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZYSTJ.getCode(), routhPathVO);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZYSTJ.getBusiness(), peasantHousehold.getOwnersName()+"待新增验收提交",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridRecord.getPeasantHouseholdId(), peasantHousehold.getOwnersName()+"待新增验收提交",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-经销商-工程");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId);
List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZYSTJ.getCode(), todoUserIds, peasantHousehold.getRegionalCompaniesCode(), 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 @ 18d01c2a
......@@ -221,7 +221,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
financingAuditingDto.setPromoter(RequestContext.getExeUserId());
financingAuditingService.createWithModel(financingAuditingDto);
//完成新增投融
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.投融资.getCode(),HygfRouthTypeEnum.HYGF_XZTSRZ.getBusiness());
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.投融资.getCode(),Long.valueOf(e));
toDoTasksService.completeToDoTasks(toDoTasks1,"");
//发起待办
String taskName="您有一条投融的待办";
......@@ -290,9 +290,10 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
//生成新增投融资待办
PeasantHouseholdDto peasantHouseholdDto = peasantHouseholdService.queryBySeq(financingInfo.getPeasantHouseholdId());
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(financingInfo.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.投融资.getCode(), HygfRouthTypeEnum.HYGF_XZTSRZ.getCode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.投融资.getCode(), HygfRouthTypeEnum.HYGF_XZTSRZ.getCode(), routhPathVO);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.投融资.getCode(), HygfRouthTypeEnum.HYGF_XZTSRZ.getBusiness(), peasantHouseholdDto.getOwnersName()+"待新增推送融资",peasantHouseholdDto.getRegionalCompaniesCode(),routhPath,wxRouthPath);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.投融资.getCode(), financingInfo.getPeasantHouseholdId(), peasantHouseholdDto.getOwnersName()+"待新增推送融资",peasantHouseholdDto.getRegionalCompaniesCode(),routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-投融");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHouseholdDto.getRegionalCompaniesCode(), roleId);
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HouseholdContractServiceImpl.java
View file @ 18d01c2a
......@@ -255,7 +255,9 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTQS.getCode(), routhPathVO);
ToDoTasks toDoTasks1 = new ToDoTasks(TaskTypeStationEnum.合同.getCode(), householdContract.getSequenceNbr(), householdContract.getPartyA() + "待合同签署", householdContract.getDealerCode(),routhPath,wxRouthPath);
PeasantHousehold peasantHousehold = peasantHouseholdServiceImpl.getById(householdContract.getPeasantHouseholdId());
toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getAmosUserId(), toDoTasks1, "");
List<String> userIds=new ArrayList<>();
userIds.add(peasantHousehold.getAmosUserId());
toDoTasksServiceImpl.completeAndAddToDoTask(userIds, toDoTasks1, "");
return householdContract;
}
......@@ -402,7 +404,9 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTQS.getCode(), routhPathVO);
ToDoTasks toDoTasks1 = new ToDoTasks(TaskTypeStationEnum.合同.getCode(), householdContract.getSequenceNbr(), householdContract.getPartyA() + "待合同签署", householdContract.getDealerCode(),routhPath,wxRouthPath);
PeasantHousehold peasan = peasantHouseholdServiceImpl.getById(householdContract.getPeasantHouseholdId());
toDoTasksServiceImpl.addToDoTasksByUserId(peasan.getAmosUserId(), toDoTasks1, "");
List<String> userIds=new ArrayList<>();
userIds.add(peasan.getAmosUserId());
toDoTasksServiceImpl.completeAndAddToDoTask(userIds, toDoTasks1, "");
return householdContract;
......
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 @ 18d01c2a
......@@ -871,6 +871,23 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
if(isAllRevok != 1) {
throw new BadRequest("该用户有未完成的任务, 无法删除！");
}
//删除勘察待办
LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ToDoTasks::getBusinessId,peasantHousehold.getSequenceNbr());
wrapper.eq(ToDoTasks::getType,TaskTypeStationEnum.勘察.getCode());
toDoTasksServiceImpl.remove(wrapper);
//删除合同待办
LambdaQueryWrapper<HouseholdContract> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(HouseholdContract::getPeasantHouseholdId,peasantHousehold.getSequenceNbr());
List<HouseholdContract> householdContracts = householdContractMapper.selectList(wrapper1);
if(CollectionUtil.isNotEmpty(householdContracts)){
for (HouseholdContract householdContract : householdContracts) {
LambdaQueryWrapper<ToDoTasks> wrapper2 = new LambdaQueryWrapper<>();
wrapper.eq(ToDoTasks::getBusinessId,householdContract.getSequenceNbr());
wrapper.eq(ToDoTasks::getType,TaskTypeStationEnum.合同.getCode());
toDoTasksServiceImpl.remove(wrapper2);
}
}
// 查询当前用户名下的电站数量
Integer powerStationNumber = peasantHouseholdMapper.selectPowerStationNumber(peasantHousehold.getAmosUserId());
......@@ -891,6 +908,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
peasantHouseholdMapper.deleteHhcByUserId(peasantHousehold.getAmosUserId());
}
return true;
// } catch (Exception e) {
// throw new BadRequest("删除失败！" + e.getMessage());
......
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 @ 18d01c2a
......@@ -231,10 +231,10 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.勘察.getCode(), powerStation.getSequenceNbr(), name + "待" + powerStationNodeEnum.getName(), peasantHousehold.getDeveloperCode(),routhPath,wxRouthPath);
List<String> userIds = new ArrayList<>();
userIds.add(peasantHousehold.getDeveloperUserId());
toDoTasksServiceImpl.addToDoTasksByUserIds(userIds, toDoTasks);
toDoTasksServiceImpl.completeAndAddToDoTask(userIds, toDoTasks,"");
}else {
if("hygf_10".equals(powerStation.getNextProcessNode()) && "不通过".equals(powerStation.getProcessStatus())){
routhPath="/mixuap?appId=1678340647909617665&id=1678363821896396801";
routhPath="/mixuap?appId=1677158789557547009&id=1783749877520404481&routhPathId="+powerStation.getSequenceNbr();
}
ToDoTasks toDoTasks= new ToDoTasks(TaskTypeStationEnum.勘察.getCode(), powerStation.getSequenceNbr(), name + "待" + powerStationNodeEnum.getName(), peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
List<String> todoUserIds = Arrays.asList(Optional.ofNullable(powerStation.getNextExecuteUserIds()).orElse("").split(","));
......
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 @ 18d01c2a
......@@ -87,7 +87,7 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T
QueryWrapper<ToDoTasks> qw = new QueryWrapper<>();
qw.eq(StringUtils.isNotEmpty(dto.getType()), "type", dto.getType());
qw.eq(StringUtils.isNotEmpty(dto.getState()), "state", dto.getState());
qw.eq(StringUtils.isNotEmpty(dto.getAmosUserId()), "amos_user_id", dto.getAmosUserId());
qw.like(StringUtils.isNotEmpty(dto.getAmosUserId()), "amos_user_id", "%"+dto.getAmosUserId()+"%");
qw.orderBy(Boolean.TRUE, Boolean.FALSE, "creation_time");
IPage<ToDoTasks> toDoTasksPage = toDoTasksMapper.selectPage(dto, qw);
......@@ -95,7 +95,6 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T
}
@Transactional
@Async
public void completeAndAddToDoTask(List<String> userIds, ToDoTasks toDoTasks, String meg) {
try {
completeToDoTasks(toDoTasks, meg);
......@@ -106,7 +105,6 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T
}
@Transactional
@Async
public void completeToDoTasks(ToDoTasks toDoTasks, String meg) {
try {
LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
......@@ -138,7 +136,6 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T
* @param businessIds
*/
@Transactional
@Async
public void deleteByBusinessIds(List<String> businessIds) {
try {
if (CollectionUtil.isNotEmpty(businessIds)) {
......@@ -167,15 +164,13 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T
public void addToDoTasksByUserIds(List<String> userIds, ToDoTasks toDoTasks) {
try {
if (CollectionUtil.isNotEmpty(userIds)) {
for (String todoUserId : userIds) {
toDoTasks.setAmosUserId(todoUserId);
toDoTasks.setSequenceNbr(sequence.nextId());
toDoTasksMapper.insert(toDoTasks);
emqKeeper.getMqttClient().publish("TASK_MESSAGE", JSON.toJSONString(toDoTasks).getBytes(), 2, false);
UserMessage userMessage = new UserMessage(toDoTasks.getType(), toDoTasks.getBusinessId(), toDoTasks.getAmosUserId(), new Date(), toDoTasks.getTaskName(), toDoTasks.getAmosOrgCode());
userMessageMapper.insert(userMessage);
emqKeeper.getMqttClient().publish("MY_MESSAGE", JSON.toJSONString(userMessage).getBytes(), 2, false);
}
toDoTasks.setAmosUserId(userIds.toString());
toDoTasks.setSequenceNbr(sequence.nextId());
toDoTasksMapper.insert(toDoTasks);
emqKeeper.getMqttClient().publish("TASK_MESSAGE", JSON.toJSONString(toDoTasks).getBytes(), 2, false);
UserMessage userMessage = new UserMessage(toDoTasks.getType(), toDoTasks.getBusinessId(), toDoTasks.getAmosUserId(), new Date(), toDoTasks.getTaskName(), toDoTasks.getAmosOrgCode());
userMessageMapper.insert(userMessage);
emqKeeper.getMqttClient().publish("MY_MESSAGE", JSON.toJSONString(userMessage).getBytes(), 2, false);
} else {
log.error("用户为空,不进行添加待办和发送消息");
}
......@@ -189,7 +184,6 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T
public void addToDoTasksByUserId(String userId, ToDoTasks toDoTasks, String meg) {
try {
LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ToDoTasks::getType, toDoTasks.getType());
wrapper.eq(ToDoTasks::getState, "待办");
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UserMessageServiceImpl.java
View file @ 18d01c2a
......@@ -47,7 +47,7 @@ public class UserMessageServiceImpl extends BaseService<UserMessageDto,UserMessa
//列表数据组装
QueryWrapper<UserMessage> qw = new QueryWrapper<>();
qw.eq(StringUtils.isNotEmpty(dto.getType()), "type",dto.getType() );
qw.eq(StringUtils.isNotEmpty(dto.getAmosUserId()), "amos_user_id",dto.getAmosUserId() );
qw.like(StringUtils.isNotEmpty(dto.getAmosUserId()), "amos_user_id","%"+dto.getAmosUserId()+"%" );
qw.orderBy(Boolean.TRUE, Boolean.FALSE, "creation_time");
IPage<UserMessage> toDoTasksPage = userMessageMapper.selectPage(dto, qw);
return toDoTasksPage;
......
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 @ 18d01c2a
......@@ -217,20 +217,23 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
//完成新增派工单待办
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.施工.getCode(), HygfRouthTypeEnum.HYGF_XZPGD.getBusiness());
toDoTasksService.completeToDoTasks(toDoTasks1,"");
//新增待办
String taskName="";
if(CollectionUtil.isNotEmpty(peasantHouseholdId)){
taskName="["+peasantHouseholdId.stream().map(i -> i.getOwnersName()).collect(Collectors.joining(","));
taskName=taskName+"]";
//新增待办此处是多个施工单
LambdaQueryWrapper<WorkOrderPowerStation> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(WorkOrderPowerStation::getWorkOrderId,model.getSequenceNbr());
List<WorkOrderPowerStation> workOrderPowerStations = workOrderPowerStationServiceImpl.list(wrapper);
if (CollectionUtil.isNotEmpty(workOrderPowerStations)){
for (WorkOrderPowerStation workOrderPowerStation : workOrderPowerStations) {
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(workOrderPowerStation.getPeasantHouseholdId());
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(workOrderPowerStation.getSequenceNbr()));
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(), workOrderPowerStation.getSequenceNbr(), peasantHousehold.getOwnersName() +"待施工",model.getRegionCode(),routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-经销商-施工");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(model.getRegionCode(), roleId, String.valueOf(model.getAmosDealerOrgCode()));
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks);
}
}
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(model.getSequenceNbr()));
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(), taskName +"待施工",model.getRegionCode(),routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-经销商-施工");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(model.getRegionCode(), roleId, String.valueOf(model.getAmosDealerOrgCode()));
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks);
return model;
}
......@@ -404,7 +407,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
regionalCompaniesCode=workOrder.getRegionCode();
amosDealerOrgCode=workOrder.getAmosDealerOrgCode();
}
String taskName = "["+workOrderPowerStationMapper.getStationName(powerStationConstructionData.getWorkOrderId())+"]"+WorkOrderEnum.待登记.getCode();
String taskName = workOrderPowerStationMapper.getStationName(powerStationConstructionData.getWorkOrderPowerStationId())+WorkOrderEnum.待登记.getCode();
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(powerStationConstructionData.getWorkOrderPowerStationId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.施工.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
......@@ -412,7 +415,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.施工.getCode(), powerStationConstructionData.getWorkOrderPowerStationId(), taskName, regionalCompaniesCode,routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.施工.getCode(),workflowResultDto.getNextNodeKey(),userIds, regionalCompaniesCode, amosDealerOrgCode);
toDoTasksService.addToDoTasksByUserIds(filterUsers,toDoTasks);
toDoTasksService.completeAndAddToDoTask(filterUsers,toDoTasks,"");
}else {
this.wofkflowExcute(workOrderStationAuditing.getInstanceId(),"0","通过",BusinessWorkflowKey.施工完成提交.getCode());
}
......@@ -566,7 +569,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
regionalCompaniesCode=workOrder.getRegionCode();
amosDealerOrgCode = workOrder.getAmosDealerOrgCode();
}
String taskName = "["+workOrderPowerStationMapper.getStationName(workOrderPowerStation.getWorkOrderId())+"]待"+workflowResultDto.getNextNodeName();
String taskName = workOrderPowerStationMapper.getStationName(workOrderPowerStation.getSequenceNbr())+"待"+workflowResultDto.getNextNodeName();
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(hygfWorkOrderStationAuditing.getWorkOrderPowerStationId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.施工.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
......@@ -582,7 +585,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
List<WorkOrder> list = workOrderMapper.selectWorkOrderList(workOrder);
list.stream().forEach(e->{
if (!e.getOwnersName().isEmpty()) {
if (!StringUtils.isEmpty(e.getOwnersName())) {
if (e.getOwnersName().split(",").length > 3){
e.setOwnersName(String.join(",", Arrays.copyOfRange(e.getOwnersName().split(","), 0, 3)));
}
......@@ -1452,20 +1455,6 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
if (list == null || list.isEmpty()) {
upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.已完工.getCode());
workOrderMapper.update(null, upq);
//完成待办
ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.施工.getCode(), workOrderPowerStation.getWorkOrderId());
toDoTasksService.completeToDoTasks(toDoTasks,"");
//生成并网待办
String taskName = "["+workOrderPowerStationMapper.getStationName(workOrderPowerStation.getWorkOrderId())+"]";
WorkOrderDto workOrderDto = queryBySeq(workOrderPowerStation.getWorkOrderId());
RouthPathVO routhPathVO = new RouthPathVO();
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.并网.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getCode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.并网.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getCode(), routhPathVO);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getBusiness(), taskName+"待新增并网登记",workOrderDto.getRegionCode(),routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-经销商-开发");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(workOrderDto.getRegionCode(), roleId,String.valueOf(workOrderDto.getAmosDealerOrgCode()));
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
}
......@@ -1477,7 +1466,20 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
up1.eq(PeasantHousehold::getSequenceNbr, idsk);
peasantHouseholdMapper.update(null, up1);
}
//判断施工状态是否完成，完成的话新增并网待办
if(WorkOrderEnum.已完工.getCode().equals(workOrderPowerStation.getPowerStationConstructionStatus())){
//生成并网待办
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(workOrderPowerStation.getPeasantHouseholdId());
WorkOrderDto workOrderDto = queryBySeq(workOrderPowerStation.getWorkOrderId());
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(workOrderPowerStation.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.并网.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getCode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.并网.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getCode(), routhPathVO);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), workOrderPowerStation.getPeasantHouseholdId(), peasantHousehold.getOwnersName()+"待新增并网登记",workOrderDto.getRegionCode(),routhPath,wxRouthPath);
List<String> todoUserIds = new ArrayList<>();
todoUserIds.add(peasantHousehold.getDeveloperUserId());
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
}
}
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/json/hygfRouth.json
View file @ 18d01c2a
......@@ -136,7 +136,7 @@
"isAdminRole": "1"
},
{
"key": "hygf_xzfgd",
"key": "hygf_xzpgd",
"taskType": "施工",
"name": "新增派工单",
"url": "/mixuap?appId=1677158789557547009&id=1742435224567967746",
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/json/wxHygfRouth.json
View file @ 18d01c2a
......@@ -136,7 +136,7 @@
"isAdminRole": "1"
},
{
"key": "hygf_xzfgd",
"key": "hygf_xzpgd",
"taskType": "施工",
"name": "新增派工单",
"url": "/view/mine/pgfl/PgflList",
......@@ -147,7 +147,7 @@
"key": "hygf_dsg",
"taskType": "施工",
"name": "待施工",
"url": "/view/mine/sggl/SgglList",
"url": "/view/mine/sggl/Sgdzlb",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
},
......@@ -155,7 +155,7 @@
"key": "Activity_0bs6t4g",
"taskType": "施工",
"name": "施工完成提交",
"url": "/view/mine/sggl/SgglList",
"url": "/view/mine/sggl/Sgdzlb",
"isNeedSpecialDeal": "0",
"isAdminRole": "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