工作台

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/BusinessTypeEnum.java

@@ -18,8 +18,7 @@ public enum BusinessTypeEnum {
     HYGF_ZGDSHLC("RectificationAudit", "整改单审核流程"),
     HYGF_YSLC("AcceptanceCheck", "验收流程"),
     HYGF_BWLC("GridConnected", "并网流程"),
-    HYGF_SGLCSH("ProcessEngineering", "施工流程审核"),
-    HYGF_REPAY("hygf_repayment", "还款"),
+    HYGF_SGLCSH("ProcessEngineering", "施工流程审核")
     ;
     private final String code;
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/HygfRouthTypeEnum.java

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+/**
+ * 户用光伏业务类型枚举
+ *
+ * @author Administrator
+ */
+public enum HygfRouthTypeEnum {
+
+    /**
+     * 业务类型枚举
+     */
+    HYGF_REPAY("hygf_repayment", "还款"),
+    HYGF_DZKC("hygf_dzkc", "电站勘察"),
+    ;
+    private final String code;
+
+    private final String name;
+
+    HygfRouthTypeEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public static String getNameByType(String code) {
+        String name = null;
+        for (HygfRouthTypeEnum enumOne : HygfRouthTypeEnum.values()) {
+            if (enumOne.getCode().equals(code)) {
+                name = enumOne.getName();
+                break;
+            }
+        }
+        return name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/PowerStationNodeEnum.java

@@ -13,7 +13,7 @@ import lombok.Getter;
 public enum PowerStationNodeEnum {
 
 
-    经销商审核("经销商确认", "hygf_02"),
+    经销商确认("经销商确认", "hygf_02"),
     设计审核("设计审核", "hygf_03"),
     投融审核("投融审核", "hygf_05"),
     法务审核("法务审核", "hygf_07"),

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/TaskTypeStationEnum.java

@@ -10,6 +10,11 @@ public enum  TaskTypeStationEnum {
     合同填报("合同填报", "合同填报"),
     重置密码("重置密码", "重置密码"),
     设置管理员("设置管理员", "设置管理员"),
+    发货管理("发货管理", "发货管理"),
+    施工完工("施工完工", "施工完工"),
+    并网管理("并网管理", "并网管理"),
+    验收管理("验收管理", "验收管理"),
+    投融资管理("投融资管理", "投融资管理"),
     还款("还款", "还款");
     /**
      * 名称，描述

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PreparationDto.java

@@ -23,4 +23,5 @@ public class PreparationDto {
     String deliveryTimeEnd;
     String flag ;
     String orderStatus;
+    String routhPathId;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/WorkOrderPage.java

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -108,4 +109,7 @@ public class WorkOrderPage {
     private String startTime;
     @ApiModelProperty(value = "结束时间",example = "2024-10-15 10:12:31")
     private String endTime;
+    @ApiModelProperty(value = "路由地址Id",example = "17068690861069734112")
+    @TableField(exist = false)
+    private String routhPathId;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/ToDoTasks.java

@@ -78,6 +78,7 @@ public class ToDoTasks extends BaseEntity {
     private String routePath;
 
 
+
     public ToDoTasks(String type, Long businessId,  String taskName,String orgCode) {
         this.type = type;
         this.businessId = businessId;
@@ -97,6 +98,13 @@ public class ToDoTasks extends BaseEntity {
         this.routePath = routePath;
     }
 
+    public ToDoTasks(String type, Long businessId) {
+        this.type = type;
+        this.businessId = businessId;
+        this.state = "待办";
+        this.creationTime = new Date();
+    }
+
     public ToDoTasks() {
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/WorkOrder.java

@@ -185,4 +185,8 @@ public class WorkOrder extends BaseEntity {
     @ApiModelProperty(value = "电站名称",example = "admin")
     @TableField(exist = false)
     private String ownersName;
+
+    @ApiModelProperty(value = "路由地址Id",example = "17068690861069734112")
+    @TableField(exist = false)
+    private String routhPathId;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PeasantHouseholdMapper.java

@@ -31,7 +31,7 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
 
     );
     @UserEmpower(field={"regional_companies_code"},dealerField={"developer_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"eq","in","eq"} ,relationship="and")
-    List<PeasantHousehold> queryForPage( String developerCode,String ownersName,Long developerId,Integer isCertified,String preparationMoneyState, String peasantHouseholdNo,String province,String isHistory,String regionalCompaniesSeq);
+    List<PeasantHousehold> queryForPage( String developerCode,String ownersName,Long developerId,Integer isCertified,String preparationMoneyState, String peasantHouseholdNo,String province,String isHistory,String regionalCompaniesSeq,String routhPathId);
 
 
     List<Map<String,Object>> selectUserIsHouse(String telephone);

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PowerStationMapper.java

@@ -25,7 +25,8 @@ public interface PowerStationMapper extends BaseMapper<PowerStation> {
 			@Param("projectAddress") String projectAddress,
 			@Param("status") String status,
 			@Param("startTime") String startTime,
-			@Param("endTime") String endTime);
+			@Param("endTime") String endTime,
+			@Param("routhPathId")String routhPathId);
 	String getInstanceIdByhouseId(String peasantHouseholdId);
 
 	List<Map<String, Object>> getKcCreateTime();

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PreparationMoneyMapper.java

@@ -39,6 +39,7 @@ public interface PreparationMoneyMapper extends BaseMapper<PreparationMoney> {
                                                  @Param(value = "province") String province,
                                                  @Param(value = "projectAddress") String projectAddress,
                                                  @Param(value = "startTime") String startTime,
-                                                 @Param(value = "endTime") String endTime);
+                                                 @Param(value = "endTime") String endTime,
+                                                 @Param(value = "routhPathId")String routhPathId);
     PreparationMoney selectPreparationMoneyInfo(@Param(value = "peasantHouseholdId") String peasantHouseholdId);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/RepaymentMapper.java

@@ -27,14 +27,7 @@ public interface RepaymentMapper extends BaseMapper<Repayment> {
      */
     PrivilegeCompany getPrivilegeCompanyByOrgCode(@Param("orgCode")String orgCode);
 
-    /**
-     * 根据角色和区域公司获取用户Id
-     * @param companyOrgCode
-     * @param roleId
-     * @return
-     */
-    List<String> getTodoUserIds(@Param("companyOrgCode") String companyOrgCode, @Param("roleId") String roleId);
+
     List<String> getTodoTelephones(@Param("userIds") List<String> userIds);
 
-    String getSequenceNbrByName(@Param("groupName") String groupName);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/ToDoTasksMapper.java

@@ -16,7 +16,16 @@ import java.util.List;
 public interface ToDoTasksMapper extends BaseMapper<ToDoTasks> {
 
 
-List<TasksRole> getTasksRole(@Param("roleId")String roleId,@Param("orgCode")String orgCode);
+    List<TasksRole> getTasksRole(@Param("roleId") String roleId, @Param("orgCode") String orgCode);
 
+    String getRoleIdByName(@Param("groupName") String groupName);
+
+    /**
+     * 根据角色和区域公司获取用户Id
+     * @param companyOrgCode
+     * @param roleId
+     * @return
+     */
+    List<String> getTodoUserIds(@Param("companyOrgCode") String companyOrgCode, @Param("roleId") String roleId);
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IDealerReviewService.java

@@ -13,5 +13,5 @@ public interface IDealerReviewService {
 
     public  com.baomidou.mybatisplus.extension.plugins.pagination.Page<ReviewDto> queryForDealerReviewPage(int pageNum, int pageSize, ReviewDto reviewDto);
 
-    boolean saveDealerReview(DealerReview dealerReview, boolean flag, boolean token,String name,String meg);
+    boolean saveDealerReview(DealerReview dealerReview, boolean flag, boolean token,String name,String regionalCompaniesCode,String meg);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/AcceptanceCheckMapper.xml

@@ -47,7 +47,9 @@
         newHcar  on newHcar.work_order_power_station_id = hbga.work_order_power_station_id
         <where>
             hbga.is_delete = 0
-
+            <if test="map.routhPathId != null and map.routhPathId != ''">
+                and hph.sequence_nbr = #{map.routhPathId}
+            </if>
             <if test="map.amosDealerId!=null and map.amosDealerId!=''">
                 and hygf_work_order.amos_dealer_id = #{map.amosDealerId}
             </if>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridAcceptanceMapper.xml

@@ -55,7 +55,9 @@
                  newHcgr  on newHcgr.work_order_power_station_id = hbga.work_order_power_station_id
         <where>
             hbga.is_delete = 0
-
+            <if test="map.routhPathId != null and map.routhPathId != ''">
+                and hph.sequence_nbr = #{map.routhPathId}
+            </if>
             <if test="map.amosDealerId!=null and map.amosDealerId!=''">
                 and hygf_work_order.amos_dealer_id = #{map.amosDealerId}
             </if>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/DealerReviewMapper.xml

@@ -46,6 +46,7 @@
             <if test="unitInfoId != null and unitInfoId != ''">
                 AND u.`sequence_nbr` = #{unitInfoId}
             </if>
+
         </where>
         ORDER BY u.audit_status ,u.rec_date DESC,u.sequence_nbr DESC
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/FinancingInfoMapper.xml

@@ -29,6 +29,9 @@
         left join hygf_financing_info hfi on hfi.peasant_household_id = hph.sequence_nbr
         <where>
             hph.construction_state = '验收完成'
+            <if test="map.routhPathId != null and map.routhPathId != ''">
+                and hph.sequence_nbr = #{map.routhPathId}
+            </if>
             <if test="params.ownersName != null and params.ownersName !=''">
                 and hph.owners_name like concat('%',#{params.ownersName},'%')
             </if>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PeasantHouseholdMapper.xml

@@ -56,6 +56,9 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
         substring_index ( hygf_peasant_household.project_address_name, '/', 1 ) AS province
         FROM hygf_peasant_household
         WHERE IS_CERTIFIED = #{isCertified}
+        <if test="routhPathId != null and routhPathId != ''">
+            and sequence_nbr = #{routhPathId}
+        </if>
         <if test="ownersName!=null and ownersName !=''">
             and owners_name like concat ('%',#{ownersName},'%')
         </if>
@@ -86,6 +89,8 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
         <if test="isHistory == null or isHistory == ''">
             and is_history is null
         </if>
+
+
         ORDER BY creation_time DESC
     </select>
     <select id="selectUserIsHouse" resultType="java.util.Map">

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PowerStationMapper.xml

@@ -59,6 +59,9 @@
                       ON ph.sequence_nbr = ps.peasant_household_id
     WHERE
         ps.is_delete = 0
+    <if test="routhPathId != null and routhPathId != ''">
+        AND ps.sequence_nbr = #{routhPathId}
+    </if>
     <if test="powerStationCode != null and powerStationCode != ''">
         AND ps.power_station_code LIKE CONCAT('%', #{powerStationCode}, '%')
     </if>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PreparationMoneyMapper.xml

@@ -20,6 +20,9 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
     <select id="selectPageList" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney">
         SELECT hygf_preparation_money.*,IFNULL(order_status,arrival_state) as orderStatus,IFNULL(order_status,delivery_state) as deliveryState,(select instance_id from hygf_preparation_money_auditing where preparation_money_id = hygf_preparation_money.sequence_nbr limit 1  ) as instanceId FROM hygf_preparation_money
         <where>
+            <if test="dto.routhPathId != null and dto.routhPathId != ''">
+                and hygf_preparation_money.sequence_nbr = #{dto.routhPathId}
+            </if>
             <if test="dto.consigneeRegion != null and dto.consigneeRegion != ''">
                 and hygf_preparation_money.consignee_region like concat ('%',#{dto.consigneeRegion},'%')
             </if>
@@ -71,6 +74,9 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
         LEFT JOIN hygf_power_station on hygf_peasant_household.sequence_nbr = hygf_power_station.peasant_household_id
         LEFT JOIN hygf_preparation_money on hygf_preparation_money.sequence_nbr = hygf_document_station.preparation_money_id
         <where>
+         <if test="routhPathId != null and routhPathId != ''">
+             and hygf_preparation_money.sequence_nbr = #{routhPathId}
+         </if>
         <if test=" preparationMoneyState == 0 ">
             and hygf_peasant_household.preparation_money_state in ('待发货','待补货','暂存发货')
         </if>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/RepaymentMapper.xml

@@ -36,12 +36,6 @@
         WHERE ORG_CODE=#{orgCode} LIMIT 1
     </select>
 
-    <select id="getTodoUserIds" resultType="java.lang.String">
-        SELECT USER_ID FROM privilege_user_org_role puor LEFT JOIN std_user_empower sue ON sue.amos_user_id=puor.USER_ID
-        WHERE (sue.amos_org_code like #{companyOrgCode} or sue.amos_org_code like '%all%') and puor.ROLE_SEQ=#{roleId}
-        and sue.permission_type='HYGF'
-        GROUP BY USER_ID;
-    </select>
 
     <select id="getTodoTelephones" resultType="java.lang.String">
         SELECT LOGIN_ID FROM auth_login_info login
@@ -55,8 +49,4 @@
         </if>
     </select>
 
-    <select id="getSequenceNbrByName" resultType="java.lang.String">
-        SELECT SEQUENCE_NBR from privilege_group where GROUP_NAME=#{groupName} LIMIT 1
-    </select>
-
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/ToDoTasksMapper.xml

@@ -22,4 +22,20 @@
      ORDER BY  privilege_agency_user.USER_ID DESC
     </select>
 
+    <select id="getRoleIdByName" resultType="java.lang.String">
+        SELECT SEQUENCE_NBR from privilege_group where GROUP_NAME=#{groupName} LIMIT 1
+    </select>
+
+    <select id="getTodoUserIds" resultType="java.lang.String">
+        SELECT USER_ID FROM privilege_user_org_role puor LEFT JOIN std_user_empower sue ON sue.amos_user_id=puor.USER_ID
+        <where>
+            puor.ROLE_SEQ=#{roleId}
+            and sue.permission_type='HYGF'
+            <if test="companyOrgCode != null and companyOrgCode != ''">
+                and  (sue.amos_org_code like #{companyOrgCode} or sue.amos_org_code like '%all%')
+            </if>
+        </where>
+
+        GROUP BY USER_ID;
+    </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/WorkOrderMapper.xml

@@ -25,6 +25,9 @@
        )  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>
@@ -106,6 +109,9 @@
             SELECT work_order_power_station_id, MIN( operation_time ) as firstConstructionDate FROM hygf_construction_records WHERE operation_content = '编辑施工资料' GROUP BY work_order_power_station_id
         ) newHcr ON newHcr.work_order_power_station_id = hygf_work_order_power_station.sequence_nbr
         <where>
+         <if test="dto.routhPathId != null and dto.routhPathId != ''">
+             and hygf_work_order_power_station.sequence_nbr = #{dto.routhPathId}
+         </if>
         <if test="dto.workOrderId!=null and dto.workOrderId!=''">
             and hygf_work_order.sequence_nbr = #{dto.workOrderId}
         </if>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/AcceptanceCheckController.java

@@ -211,7 +211,8 @@ public class AcceptanceCheckController extends BaseController {
 																@ApiParam(value = "经销商公司名称",example = "xxxxx公司")@RequestParam(required = false, value = "developerName") String developerName,
 																@ApiParam(value = "区域公司名称",example = "xxxxx公司")@RequestParam(required = false, value = "regionalCompaniesName") String regionalCompaniesName,
 																@ApiParam(value = "筛选用第一次提交开始时间",example = "2024-03-05 00:00:00")@RequestParam(required = false, value = "startTime") String startTime,
-																@ApiParam(value = "筛选用第一次提交结束时间",example = "2024-05-05 23:00:59")@RequestParam(required = false, value = "endTime") String endTime) throws Exception {
+																@ApiParam(value = "筛选用第一次提交结束时间",example = "2024-05-05 23:00:59")@RequestParam(required = false, value = "endTime") String endTime,
+																@RequestParam(required = false, value = "routhPathId") String routhPathId) throws Exception {
 		//当前登录人所属场站
 //        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
 
@@ -240,7 +241,7 @@ public class AcceptanceCheckController extends BaseController {
 				basicGridNodes.add("ys-zichan");
 			}
 		}
-		Page<AcceptanceCheckDto> page = acceptanceCheckServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, acceptanceCheckStatus, acceptanceTime, "",basicGridNodes,type,province, developerName, regionalCompaniesName, startTime, endTime);
+		Page<AcceptanceCheckDto> page = acceptanceCheckServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, acceptanceCheckStatus, acceptanceTime, "",basicGridNodes,type,province, developerName, regionalCompaniesName, startTime, endTime,routhPathId);
 		//根据角色及当前节点判断是否有操作权限
 		if (basicGridNodes != null){
 			for (AcceptanceCheckDto e : page.getRecords()) {

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/BasicGridAcceptanceController.java

@@ -157,7 +157,8 @@ public class BasicGridAcceptanceController extends BaseController {
 			@ApiParam(value = "经销商公司名称",example = "xxxxx公司")@RequestParam(required = false, value = "developerName") String developerName,
 			@ApiParam(value = "区域公司",example = "xxxxx公司")@RequestParam(required = false, value = "regionalCompaniesName") String regionalCompaniesName,
 			@ApiParam(value = "第一次提交时间 筛选用开始时间",example = "2024-03-02 23:12:23")@RequestParam(required = false, value = "startTime") String startTime,
-			@ApiParam(value = "第一次提交时间 筛选用结束时间",example = "2024-04-02 23:12:23")@RequestParam(required = false, value = "endTime") String endTime) throws Exception {
+			@ApiParam(value = "第一次提交时间 筛选用结束时间",example = "2024-04-02 23:12:23")@RequestParam(required = false, value = "endTime") String endTime,
+																@RequestParam(required = false, value = "routhPathId") String routhPathId) throws Exception {
 		// 当前登录人所属场站
 //        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
 
@@ -184,7 +185,7 @@ public class BasicGridAcceptanceController extends BaseController {
 		}
 		Page<BasicGridRecordDto> page = basicGridAcceptanceServiceImpl.selectPage(null, null, current, size,
 				projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "", basicGridNodes, type,
-				province, developerName, regionalCompaniesName, startTime, endTime);
+				province, developerName, regionalCompaniesName, startTime, endTime,routhPathId);
 		// 根据角色及当前节点判断是否有操作权限
 		if (basicGridNodes != null) {
 			for (BasicGridRecordDto e : page.getRecords()) {
@@ -220,11 +221,12 @@ public class BasicGridAcceptanceController extends BaseController {
 			@ApiParam(value = "业主姓名",example = "曹德文")@RequestParam(required = false, value = "ownersName") String ownersName,
 			@ApiParam(value = "并网状态",example = "2")@RequestParam(required = false, value = "gridStatus") String gridStatus,
             @ApiParam(value = "并网时间",example = "2024-01-03")@RequestParam(required = false, value = "gridConnectionTime") String gridConnectionTime,
-			@ApiParam(value = "省份",example = "陕西省")@RequestParam(required = false, value = "province") String province) throws Exception {
+			@ApiParam(value = "省份",example = "陕西省")@RequestParam(required = false, value = "province") String province,
+																	 @RequestParam(required = false, value = "routhPathId") String routhPathId) throws Exception {
 		// 当前登录人所属场站
 
 		Page<BasicGridRecordDto> page = basicGridAcceptanceServiceImpl.selectPage(null, null, current, size,
-				projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "check", null, null,province, null, null, null, null);
+				projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "check", null, null,province, null, null, null, null,routhPathId);
 		return ResponseHelper.buildResponse(page);
 	}
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/FinancingInfoController.java

@@ -172,11 +172,12 @@ public class FinancingInfoController extends BaseController {
 																 @RequestParam(value = "developerName",required = false) String developerName,
 																 @RequestParam(value = "financingCompaniesName",required = false) String financingCompaniesName,
 																 @RequestParam(value = "startTime",required = false) String startTime,
-																 @RequestParam(value = "endTime",required = false) String endTime){
+																 @RequestParam(value = "endTime",required = false) String endTime,
+																 @RequestParam(value = "routhPathId",required = false) String routhPathId){
 	    Page<Map<String, Object>> page = new Page<Map<String, Object>>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(financingInfoServiceImpl.queryForFinancingInfoPage(page,type,status,regionalCompaniesCode,ownersName, region,batchNo,isHistory, projectAddress, peasantHouseholdNo, developerName, financingCompaniesName, startTime, endTime));
+	    return ResponseHelper.buildResponse(financingInfoServiceImpl.queryForFinancingInfoPage(page,type,status,regionalCompaniesCode,ownersName, region,batchNo,isHistory, projectAddress, peasantHouseholdNo, developerName, financingCompaniesName, startTime, endTime,routhPathId));
 	}
 
 	/**

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HouseholdContractController.java

@@ -205,9 +205,9 @@ public class HouseholdContractController extends BaseController {
         householdContrac.setStatus(HouseholdContractEnum.合同状态_农户已签署.getCode());
 
         //生成填报任务
-        ToDoTasks toDoTasks1=  new ToDoTasks (  TaskTypeStationEnum.合同填报.getCode(),  householdContrac.getSequenceNbr(),  "用户"+householdContrac.getPartyA()+"合同盖章",null);
-        toDoTasksServiceImpl.addToDoTasksByRole(engineering,toDoTasks1,"发起合同成功");
-
+        ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.合同填报.getCode(), householdContrac.getSequenceNbr(), "用户"+householdContrac.getPartyA()+"合同盖章", householdContrac.getRegionalCompaniesCode());
+        List<String> todoUserIds = toDoTasksServiceImpl.getTodoUserIds(null, engineering);
+        toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds, toDoTasks);
 
         return ResponseHelper.buildResponse(householdContractServiceImpl.updateById(householdContrac));
     }
@@ -230,12 +230,6 @@ public class HouseholdContractController extends BaseController {
         householdContrac.setStatus(HouseholdContractEnum.合同状态_双方已签署.getCode());
         householdContrac.setSealedUser(getUserInfo().getRealName());
 
-        LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.合同填报.getCode());
-        wrapper.eq(ToDoTasks::getState, "待办");
-        wrapper.eq(ToDoTasks::getBusinessId, householdContrac.getSequenceNbr());
-        ToDoTasks doTasks= toDoTasksMapper.selectOne(wrapper);
-
         PeasantHousehold peasantHousehold = peasantHouseholdServiceImpl.getDataByState(householdContrac.getPeasantHouseholdId());
         System.out.println("开始更新农户发货状态"+householdContrac.getPeasantHouseholdId());
         if (peasantHousehold != null){
@@ -245,18 +239,9 @@ public class HouseholdContractController extends BaseController {
             System.out.println("更新成功"+householdContrac.getPeasantHouseholdId());
 
         }
+        ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.合同填报.getCode(), householdContrac.getSequenceNbr());
+        toDoTasksServiceImpl.completeToDoTasks(toDoTasks,"");
 
-            if(doTasks!=null){
-            doTasks.setState("已办");
-            doTasks.setCompleteTime(new Date());
-            toDoTasksMapper.updateById(doTasks);
-            emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(doTasks).getBytes(), 2 ,false);
-
-            UserMessage userMessage=  new UserMessage( doTasks.getType(),  doTasks.getBusinessId(),  doTasks.getAmosUserId(),  new Date(),  doTasks.getTaskName()+"已完成",  doTasks.getAmosOrgCode());
-            userMessageMapper.insert(userMessage);
-            emqKeeper.getMqttClient().publish("MY_MESSAGE" , JSON.toJSONString(userMessage).getBytes(), 2 ,false);
-
-        }
         }catch (Exception e){
             e.printStackTrace();
             throw new BadRequest("系统异常");

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PeasantHouseholdController.java

@@ -214,7 +214,8 @@ public class PeasantHouseholdController extends BaseController {
 															  @RequestParam(value = "developerId",required = false)Long developerId,
 															  @RequestParam(value = "regionalCompaniesSeq",required = false)String regionalCompaniesSeq,
 															  @RequestParam(value = "peasantHouseholdNo",required = false) String peasantHouseholdNo,
-															  @RequestParam(value = "province",required = false) String province) {
+															  @RequestParam(value = "province",required = false) String province,
+															  @RequestParam(value = "routhPathId",required = false) String routhPathId) {
 	    Page<PeasantHousehold> page = new Page<PeasantHousehold>();
 	    page.setCurrent(current);
 	    page.setSize(size);
@@ -227,7 +228,7 @@ public class PeasantHouseholdController extends BaseController {
 //        String orgCode = userUnitInformationDto.getAmosDealerOrgCode();
 
 		Integer isCertified = PeasantHouseholdEnum.已认证.getCode();
-		return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryForPeasantHouseholdPage(page, null,ownersName,developerId,isCertified,preparationMoneyState, peasantHouseholdNo,province,isHistory,regionalCompaniesSeq));
+		return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryForPeasantHouseholdPage(page, null,ownersName,developerId,isCertified,preparationMoneyState, peasantHouseholdNo,province,isHistory,regionalCompaniesSeq,routhPathId));
 	}
 
 	/**

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PowerStationController.java

@@ -109,12 +109,13 @@ public class PowerStationController extends BaseController {
 															@RequestParam(value = "projectAddress",required = false)String projectAddress,
 															@RequestParam(value = "status",required = false)String status,
 															@RequestParam(value = "startTime",required = false)String startTime,
-															@RequestParam(value = "endTime",required = false)String endTime) {
+															@RequestParam(value = "endTime",required = false)String endTime,
+															 @RequestParam(value = "routhPathId",required = false) String routhPathId) {
 	    Page<PowerStationDto> page = new Page<PowerStationDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
 		AgencyUserModel userInfo = getUserInfo();
-		return ResponseHelper.buildResponse(powerStationServiceImpl.queryForPowerStationUserRoles(page,powerStationCode,ownersName,userInfo,serviceAgent,regionalCompaniesName,processStatus,province, projectAddress, status, startTime, endTime));
+		return ResponseHelper.buildResponse(powerStationServiceImpl.queryForPowerStationUserRoles(page,powerStationCode,ownersName,userInfo,serviceAgent,regionalCompaniesName,processStatus,province, projectAddress, status, startTime, endTime,routhPathId));
 	}
 
 	/**

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PreparationMoneyController.java

@@ -348,9 +348,10 @@ public class PreparationMoneyController extends BaseController {
 			@RequestParam(value = "province",required = false) String province,
 			@RequestParam(value = "projectAddress",required = false) String projectAddress,
 			@RequestParam(value = "startTime",required = false) String startTime,
-			@RequestParam(value = "endTime",required = false) String endTime){
+			@RequestParam(value = "endTime",required = false) String endTime,
+			@RequestParam(value = "routhPathId",required = false) String routhPathId){
 
-		return ResponseHelper.buildResponse(preparationMoneyServiceImpl.preparationStation(current,size,preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state,province, projectAddress, startTime, endTime)) ;
+		return ResponseHelper.buildResponse(preparationMoneyServiceImpl.preparationStation(current,size,preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state,province, projectAddress, startTime, endTime,routhPathId)) ;
 	}
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/QiyuesuoController.java

@@ -193,10 +193,9 @@ public class QiyuesuoController extends BaseController {
 				wrapper4.eq(HouseholdContract::getContractLockId, CallbackDto.getContractId());
 				HouseholdContract householdContrac = householdContractMapper.selectOne(wrapper4);
 				// 生成填报任务
-				ToDoTasks toDoTasks1 = new ToDoTasks(TaskTypeStationEnum.合同填报.getCode(),
-						householdContrac.getSequenceNbr(), "用户" + householdContrac.getPartyA() + "合同盖章", null);
-				toDoTasksServiceImpl.addToDoTasksByRole(engineering, toDoTasks1, "合同签字成功");
-
+				ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.合同填报.getCode(), householdContrac.getSequenceNbr(), "用户" + householdContrac.getPartyA() + "合同盖章", householdContrac.getRegionalCompaniesCode());
+				List<String> todoUserIds = toDoTasksServiceImpl.getTodoUserIds(null, engineering);
+				toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds, toDoTasks);
 			} else if ("SEAL".equals(CallbackDto.getCallbackType())) {
 
 				LambdaUpdateWrapper<HouseholdContract> wrapper = new LambdaUpdateWrapper<>();
@@ -219,26 +218,8 @@ public class QiyuesuoController extends BaseController {
 					peasantHouseholdServiceImpl.getBaseMapper().updateById(peasantHousehold);
 					logger.info("更新成功");
 				}
-
-				LambdaQueryWrapper<ToDoTasks> wrapper1 = new LambdaQueryWrapper<>();
-				wrapper1.eq(ToDoTasks::getType, TaskTypeStationEnum.合同填报.getCode());
-				wrapper1.eq(ToDoTasks::getState, "待办");
-				wrapper1.eq(ToDoTasks::getBusinessId, contract.getSequenceNbr());
-				ToDoTasks doTasks = toDoTasksMapper.selectOne(wrapper1);
-				if (doTasks != null) {
-					doTasks.setState("已办");
-					doTasks.setCompleteTime(new Date());
-					toDoTasksMapper.updateById(doTasks);
-					emqKeeper.getMqttClient().publish("TASK_MESSAGE", JSON.toJSONString(doTasks).getBytes(), 2, false);
-
-					UserMessage userMessage = new UserMessage(doTasks.getType(), doTasks.getBusinessId(),
-							doTasks.getAmosUserId(), new Date(), doTasks.getTaskName() + "已完成",
-							doTasks.getAmosOrgCode());
-					userMessageMapper.insert(userMessage);
-					emqKeeper.getMqttClient().publish("MY_MESSAGE", JSON.toJSONString(userMessage).getBytes(), 2,
-							false);
-
-				}
+				ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.合同填报.getCode(), contract.getSequenceNbr());
+				toDoTasksServiceImpl.completeToDoTasks(toDoTasks,"");
 			}
 			try {
 				hygfContractCallRecord.setStatus("success");

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceCheckServiceImpl.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
@@ -19,6 +20,7 @@ import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PowerStationEngineeringInfoMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceCheckService;
 import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
+import com.yeejoin.amos.boot.module.hygf.biz.vo.RouthPathVO;
 import com.yeejoin.amos.component.robot.BadRequest;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -66,11 +68,13 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
     FinancingInfoServiceImpl financingInfoService;
     @Autowired
     FinancingAuditingServiceImpl financingAuditingService;
+    @Autowired
+    ToDoTasksServiceImpl toDoTasksService;
 
 
     public Page<AcceptanceCheckDto> selectPage(Long regionCompanyId, Long amosDealerId, int current, int size,
                                                String projectAddress, String powerStationCode, String ownersName, String acceptanceCheckStatus,
-                                               String gridConnectionTime, String formType, List<String> basicGridNodes, String type,String province, String developerName, String regionalCompaniesName, String startTime, String endTime) throws Exception {
+                                               String gridConnectionTime, String formType, List<String> basicGridNodes, String type,String province, String developerName, String regionalCompaniesName, String startTime, String endTime,String routhPathId) throws Exception {
         PageHelper.startPage(current, size);
         Map<String, Object> map = new HashMap<>();
         Date date = null;
@@ -92,6 +96,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
         map.put("regionalCompaniesName", regionalCompaniesName);
         map.put("startTime", startTime);
         map.put("endTime", endTime);
+        map.put("routhPathId", routhPathId);
         List<AcceptanceCheckDto> list = acceptanceCheckMapper.selectPageList(map);
 
         if(list != null && list.size() > 0) {
@@ -165,6 +170,9 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
             BeanUtils.copyProperties(workflowResultDto, basicGridAuditingDto);
             basicGridAuditingDto.setPeasantHouseholdId(basicGridRecord.getPeasantHouseholdId());
             basicGridAuditingDto.setPromoter(RequestContext.getExeUserId());
+            Sequence sequence = new Sequence();
+            long auditingSequenceNbr = sequence.nextId();
+            basicGridAuditingDto.setSequenceNbr(auditingSequenceNbr);
             acceptanceCheckAuditingService.createWithModel(basicGridAuditingDto);
             update.set(AcceptanceCheck::getInstanceId,basicGridAuditingDto.getInstanceId());
 
@@ -175,8 +183,19 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
             up.eq(PeasantHousehold::getSequenceNbr, idsk);
             peasantHouseholdMapper.update(null, up);
             //发起待办
-//            workflowResultDto.setInstanceId(basicGridRecord.getInstanceId());
-//            commonService.buildTaskModel(commonService.buildTaskModelDto(basicGridRecord, workflowResultDto, BusinessTypeEnum.HYGF_YSLC));
+            PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridRecord.getPeasantHouseholdId());
+            String taskName="您有一条验收的待办";
+            String orgCode="";
+            if(Objects.nonNull(peasantHousehold)){
+                taskName="电站名称" + peasantHousehold.getOwnersName() + "有一条验收状态为" +peasantHousehold.getConstructionState() + "待办" ;
+                orgCode=peasantHousehold.getRegionalCompaniesCode();
+            }
+            RouthPathVO routhPathVO = new RouthPathVO();
+            routhPathVO.setRouthPathId(String.valueOf(basicGridRecord.getPeasantHouseholdId()));
+            String routhPath = toDoTasksService.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
+            ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.验收管理.getCode(),  auditingSequenceNbr,  taskName, orgCode,routhPath);
+            List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
+            toDoTasksService.addToDoTasksByUserIds(userIds,toDoTasks);
         }
 
         //防止重复提交
@@ -243,8 +262,19 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
         }
         acceptanceCheckAuditingService.createWithModel(basicGridAuditingDto);
         //更新待办
-//        workflowResultDto.setInstanceId(basicGridAuditingDto.getInstanceId());
-//        commonService.updateTaskModelAndAddTask(basicGridAuditingDto,workflowResultDto,BusinessTypeEnum.HYGF_YSLC);
+        PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridAuditing.getPeasantHouseholdId());
+        String taskName="您有一条验收的待办";
+        String orgCode="";
+        if(Objects.nonNull(peasantHousehold)){
+            taskName="电站名称" + peasantHousehold.getOwnersName() + "流程流转到" +workflowResultDto.getNextNodeName() + "需待办" ;
+            orgCode=peasantHousehold.getRegionalCompaniesCode();
+        }
+        RouthPathVO routhPathVO = new RouthPathVO();
+        routhPathVO.setRouthPathId(String.valueOf(basicGridAuditing.getPeasantHouseholdId()));
+        String routhPath = toDoTasksService.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
+        ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.验收管理.getCode(),  basicGridAuditing.getSequenceNbr(),   taskName,orgCode,routhPath);
+        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

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -23,6 +24,7 @@ import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
 import com.yeejoin.amos.boot.module.hygf.api.service.IBasicGridAcceptanceService;
 import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
 import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
+import com.yeejoin.amos.boot.module.hygf.biz.vo.RouthPathVO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
@@ -94,13 +96,15 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 	AcceptanceCheckServiceImpl acceptanceCheckService;
 	@Autowired
 	ConstructionGirdRecordsServiceImpl constructionGirdRecords;
+	@Autowired
+	ToDoTasksServiceImpl toDoTasksService;
 
 	private final String OK = "0";
 	private final String PASS = "5";
 
 	public Page<BasicGridRecordDto> selectPage(Long regionCompanyId, Long amosDealerId, int current, int size,
 											   String projectAddress, String powerStationCode, String ownersName, String gridStatus,
-											   String gridConnectionTime, String formType, List<String> basicGridNodes, String type, String province, String developerName, String regionalCompaniesName, String startTime, String endTime)
+											   String gridConnectionTime, String formType, List<String> basicGridNodes, String type, String province, String developerName, String regionalCompaniesName, String startTime, String endTime,String routhPathId)
 			throws Exception {
 		PageHelper.startPage(current, size);
 		Map<String, Object> map = new HashMap<>();
@@ -123,6 +127,7 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 		map.put("regionalCompaniesName", regionalCompaniesName);
 		map.put("startTime", startTime);
 		map.put("endTime", endTime);
+		map.put("routhPathId", routhPathId);
 		List<BasicGridRecordDto> list = basicGridAcceptanceMapper.selectPageList(map);
 		PageInfo<BasicGridRecordDto> page = new PageInfo(list);
 		Page<BasicGridRecordDto> pageNew = new Page<>();
@@ -246,6 +251,9 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 			BeanUtils.copyProperties(workflowResultDto, basicGridAuditingDto);
 			basicGridAuditingDto.setPeasantHouseholdId(grid.getPeasantHouseholdId());
 			basicGridAuditingDto.setPromoter(RequestContext.getExeUserId());
+			Sequence sequence = new Sequence();
+			long auditingSequenceNbr = sequence.nextId();
+			basicGridAuditingDto.setSequenceNbr(auditingSequenceNbr);
 			basicGridAuditingService.createWithModel(basicGridAuditingDto);
 			update.set(BasicGridRecord::getInstanceId, basicGridAuditingDto.getInstanceId());
 
@@ -256,8 +264,19 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 			up.eq(PeasantHousehold::getSequenceNbr, idsk);
 			peasantHouseholdMapper.update(null, up);
 			//发起待办
-//			workflowResultDto.setInstanceId(basicGridRecord.getInstanceId());
-//			commonService.buildTaskModel(commonService.buildTaskModelDto(basicGridRecord, workflowResultDto, BusinessTypeEnum.HYGF_BWLC));
+			PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(grid.getPeasantHouseholdId());
+			String taskName="您有一条并网的待办";
+			String orgCode="";
+			if(Objects.nonNull(peasantHousehold)){
+				taskName="电站名称" + peasantHousehold.getOwnersName() + "有一条并网状态为" +peasantHousehold.getConstructionState() + "待办" ;
+				orgCode=peasantHousehold.getRegionalCompaniesCode();
+			}
+			RouthPathVO routhPathVO = new RouthPathVO();
+			routhPathVO.setRouthPathId(String.valueOf(grid.getPeasantHouseholdId()));
+			String routhPath = toDoTasksService.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
+			ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.并网管理.getCode(),  auditingSequenceNbr,  taskName, orgCode,routhPath);
+			List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
+			toDoTasksService.addToDoTasksByUserIds(userIds,toDoTasks);
 		}
 
 		// 防止重复提交
@@ -506,8 +525,19 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 		}
 		basicGridAuditingService.createWithModel(basicGridAuditingDto);
 		//更新待办
-//		workflowResultDto.setInstanceId(basicGridAuditingDto.getInstanceId());
-//		commonService.updateTaskModelAndAddTask(basicGridAuditingDto,workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
+		PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridAuditing.getPeasantHouseholdId());
+		String taskName="您有一条并网的待办";
+		String orgCode="";
+		if(Objects.nonNull(peasantHousehold)){
+			taskName="电站名称" + peasantHousehold.getOwnersName() + "流程流转到" +workflowResultDto.getNextNodeName() + "需待办" ;
+			orgCode=peasantHousehold.getRegionalCompaniesCode();
+		}
+		RouthPathVO routhPathVO = new RouthPathVO();
+		routhPathVO.setRouthPathId(String.valueOf(basicGridAuditing.getPeasantHouseholdId()));
+		String routhPath = toDoTasksService.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
+		ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.并网管理.getCode(),  basicGridAuditing.getSequenceNbr(),   taskName,orgCode,routhPath);
+		List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
+		toDoTasksService.completeAndAddToDoTask(userIds,toDoTasks,"");
 	}
 
 	public void completeAdminAudit(Map<String, String> kv) {

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/CommonServiceImpl.java

@@ -88,8 +88,6 @@ public class CommonServiceImpl {
 //    private TaskV2FeignService taskV2FeignService;
     @Autowired
     private RedisUtils redisUtils;
-    @Value("classpath:/json/hygfRouth.json")
-    private Resource urlInfo;
     @Autowired
     SurveyInformationServiceImpl surveyInformationServiceImpl;
     @Autowired
@@ -138,23 +136,7 @@ public class CommonServiceImpl {
 
     private ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
     private ExecutorService executorService = Executors.newFixedThreadPool(50); // 创建固定大小的线程池
-    public String getRouthPath(String type,Object model) {
-        List<Map> urlList = JsonUtils.getResourceList(urlInfo);
-        String routhPath="";
-        String urlParams = "";
-        try {
-            urlParams = "&" + toQueryParams(model);
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        for (Map map : urlList) {
-            if (map.get("type").equals(type)) {
-                routhPath = (map.get("url").toString() + urlParams);
-                break;
-            }
-        }
-        return routhPath;
-    }
+
 //    private static String toQueryParams2(JSONObject jsonObject) {
 //        StringBuilder sb = new StringBuilder();
 //        Set<String> keys = jsonObject.keySet();
@@ -448,32 +430,7 @@ public class CommonServiceImpl {
 //        }
 //    }
 
-    private  <T> String toQueryParams(T obj) throws UnsupportedEncodingException {
-        StringBuilder sb = new StringBuilder();
-
-        for (Class<?> clazz = obj.getClass(); !clazz.equals(Object.class); clazz = clazz.getSuperclass()) {
-            Field[] fields = clazz.getDeclaredFields();
-
-            for (Field field : fields) {
-                if (!Modifier.isStatic(field.getModifiers())) {
-                    field.setAccessible(true);
 
-                    try {
-                        Object value = field.get(obj);
-
-                        if (value != null && !"".equals(value)) {
-                            String encodedValue = URLEncoder.encode(value.toString(), "UTF-8");
-                            sb.append(field.getName()).append('=').append(encodedValue).append('&');
-                        }
-                    } catch (IllegalAccessException e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-            }
-        }
-
-        return sb.length() > 0 ? sb.substring(0, sb.length() - 1) : "";
-    }
 
 //    /**
 //     * 更新并完成

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/DealerReviewServiceImpl.java

@@ -5,18 +5,21 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.DealerReviewEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.DealerReviewDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.ReviewDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.WorkDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.DealerReview;
 import com.yeejoin.amos.boot.module.hygf.api.entity.ToDoTasks;
+import com.yeejoin.amos.boot.module.hygf.api.entity.UnitInfo;
 import com.yeejoin.amos.boot.module.hygf.api.entity.UserMessage;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.DealerReviewMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.ToDoTasksMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.UserMessageMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IDealerReviewService;
 import com.yeejoin.amos.boot.module.hygf.biz.feign.WorkflowFeignClient;
+import com.yeejoin.amos.boot.module.hygf.biz.vo.RouthPathVO;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import org.apache.commons.lang.StringUtils;
@@ -49,9 +52,7 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
     @Autowired
     AmosRequestContext requestContext;
     @Autowired
-    ToDoTasksServiceImpl toDoTasksServiceImpl;
-    @Autowired
-    ToDoTasksMapper toDoTasksMapper;
+    ToDoTasksServiceImpl toDoTasksService;
 
     @Value("${amos.system.user.product}")
     private String AMOS_STUDIO_WEB;
@@ -60,6 +61,7 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
     @Autowired
     UserMessageMapper userMessageMapper;
 
+
     @Override
     public com.baomidou.mybatisplus.extension.plugins.pagination.Page<ReviewDto> queryForDealerReviewPage(int pageNum, int pageSize, ReviewDto reviewDto) {
         PageHelper.startPage(pageNum, pageSize);
@@ -74,7 +76,7 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
     }
 
     @Override
-    public boolean saveDealerReview(DealerReview dealerReview, boolean flag, boolean token,String name,String meg) {
+    public boolean saveDealerReview(DealerReview dealerReview, boolean flag, boolean token, String name, String regionalCompaniesCode, String meg) {
         try {
             //流程节点code
             if (flag) {
@@ -86,25 +88,17 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
             }
             boolean fl = this.saveOrUpdate(dealerReview);
             if (flag) {
-                ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.经销商审核.getCode(), dealerReview.getSequenceNbr(), "经销商"+name+"待经销商审核",null);
-                toDoTasksServiceImpl.addToDoTasksByRole(dealerReview.getNodeRole(), toDoTasks,meg);
+                //添加待办
+                RouthPathVO routhPathVO = new RouthPathVO();
+                routhPathVO.setRouthPathId(String.valueOf(dealerReview.getUnitInfoId()));
+                String routhPath = toDoTasksService.getRouthPath(dealerReview.getNextProcessNode(), routhPathVO);
+                ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.经销商审核.getCode(), dealerReview.getUnitInfoId(), "经销商"+ name +"待经销商审核", regionalCompaniesCode, routhPath);
+                String roleId = toDoTasksService.getRoleIdByName("户用光伏-管理员");
+                List<String> todoUserIds = toDoTasksService.getTodoUserIds(null, roleId);
+                toDoTasksService.addToDoTasksByUserIds(todoUserIds, toDoTasks);
             }else{
-                LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.经销商审核.getCode());
-                wrapper.eq(ToDoTasks::getState, "待办");
-                wrapper.eq(ToDoTasks::getBusinessId, dealerReview.getSequenceNbr());
-                ToDoTasks doTasks= toDoTasksMapper.selectOne(wrapper);
-                if(doTasks!=null){
-                    doTasks.setState("已办");
-                    doTasks.setCompleteTime(new Date());
-                    toDoTasksMapper.updateById(doTasks);
-                    emqKeeper.getMqttClient().publish("TASK_MESSAGE" , JSON.toJSONString(doTasks).getBytes(), 2 ,false);
-
-                    UserMessage userMessage=  new UserMessage( doTasks.getType(),  doTasks.getBusinessId(),  doTasks.getAmosUserId(),  new Date(),  doTasks.getTaskName()+"已完成."+meg,  doTasks.getAmosOrgCode());
-                    userMessageMapper.insert(userMessage);
-                    emqKeeper.getMqttClient().publish("MY_MESSAGE" ,JSON.toJSONString(userMessage).getBytes(), 2 ,false);
-
-                }
+                ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.经销商审核.getCode(), dealerReview.getUnitInfoId());
+                toDoTasksService.completeToDoTasks(toDoTasks,meg);
             }
                 return fl;
         } catch (Exception e) {

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/FinancingInfoServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -29,6 +30,7 @@ import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PowerStationEngineeringInfoMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IFinancingInfoService;
 import com.yeejoin.amos.boot.module.hygf.api.util.RedisLockUtil;
+import com.yeejoin.amos.boot.module.hygf.biz.vo.RouthPathVO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
@@ -83,12 +85,14 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
     private AcceptanceCheckAuditingServiceImpl acceptanceCheckAuditingService;
     @Autowired
     private FinancingRegionalServiceImpl financingRegionalService;
+    @Autowired
+    private ToDoTasksServiceImpl toDoTasksService;
 
     @Resource(type = RedisLockUtil.class)
     private RedisLockUtil redisLockUtil;
 
     @UserLimits
-    public Page<Map<String, Object>> queryForFinancingInfoPage(Page<Map<String, Object>> page, String type, String status, String regionalCompaniesCode, String ownersName, String region,String batchNo,String isHistory, String projectAddress, String peasantHouseholdNo, String developerName, String financingCompaniesName, String startTime, String endTime) {
+    public Page<Map<String, Object>> queryForFinancingInfoPage(Page<Map<String, Object>> page, String type, String status, String regionalCompaniesCode, String ownersName, String region,String batchNo,String isHistory, String projectAddress, String peasantHouseholdNo, String developerName, String financingCompaniesName, String startTime, String endTime,String routhPathId) {
         StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
@@ -108,6 +112,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         params.put("financingCompaniesName", financingCompaniesName);
         params.put("startTime", startTime);
         params.put("endTime", endTime);
+        params.put("routhPathId", routhPathId);
         // 1 投融人员  2.融资  3经销商管理员
         switch (type) {
             case "1":
@@ -220,10 +225,18 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
                     financingAuditingDto.setPromoter(RequestContext.getExeUserId());
                     financingAuditingService.createWithModel(financingAuditingDto);
                     //发起待办
-//                    FinancingInfo newFinancingInfo = new FinancingInfo();
-//                    BeanUtils.copyProperties(model, newFinancingInfo);
-//                    newFinancingInfo.setStatus(FinancingAuditEnum.待融资审核.getName());
-//                    commonService.buildTaskModel(commonService.buildTaskModelDto(newFinancingInfo, workflowResultDto, BusinessTypeEnum.HYGF_DZTRRZ));
+                    String taskName="您有一条验收的待办";
+                    String orgCode="";
+                    if(Objects.nonNull(peasantHousehold)){
+                        taskName="电站名称" + peasantHousehold.getOwnersName() + "有一条投融资状态为" +FinancingAuditEnum.待融资审核.getName() + "待办" ;
+                        orgCode=peasantHousehold.getRegionalCompaniesCode();
+                    }
+                    RouthPathVO routhPathVO = new RouthPathVO();
+                    routhPathVO.setRouthPathId(String.valueOf(peasantHousehold.getSequenceNbr()));
+                    String routhPath = toDoTasksService.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
+                    ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.投融资管理.getCode(),  peasantHousehold.getSequenceNbr(),  taskName, orgCode,routhPath);
+                    List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
+                    toDoTasksService.addToDoTasksByUserIds(userIds,toDoTasks);
                 }
                 //批量 兼容审核不通过及整改待推送
                 else if (financingInfos.getStatus().equals(FinancingAuditEnum.审核不通过.getName()) || financingInfos.getStatus().equals("待推送")   ){
@@ -272,9 +285,11 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
             financingRectificationOrderService.getBaseMapper().delete(wrapper1);
 
             this.deleteBySeq(financingInfo.getSequenceNbr());
+            //停止流程
+            ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.投融资管理.getCode(), financingInfo.getPeasantHouseholdId());
+            toDoTasksService.completeToDoTasks(toDoTasks,"");
         }
-        //停止流程
-//        commonService.deleteTaskModel(processId);
+
     }
 
     @Override
@@ -357,8 +372,19 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         }
         this.updateById(financingInfo);
         //更新待办
-//        workflowResultDto.setInstanceId(financingAuditing.getInstanceId());
-//        commonService.updateTaskModelAndAddTask(financingInfo,workflowResultDto,BusinessTypeEnum.HYGF_DZTRRZ);
+        PeasantHousehold peasantHousehold = peasantHouseholdService.getBaseMapper().selectById(financingAuditing.getPeasantHouseholdId());
+        String taskName="您有一条投融资的待办";
+        String orgCode="";
+        if(Objects.nonNull(peasantHousehold)){
+            taskName="电站名称" + peasantHousehold.getOwnersName() + "流程流转到" +workflowResultDto.getNextNodeName() + "需待办" ;
+            orgCode=peasantHousehold.getRegionalCompaniesCode();
+        }
+        RouthPathVO routhPathVO = new RouthPathVO();
+        routhPathVO.setRouthPathId(String.valueOf(financingAuditing.getPeasantHouseholdId()));
+        String routhPath = toDoTasksService.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
+        ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.投融资管理.getCode(),  peasantHousehold.getSequenceNbr(),   taskName,orgCode,routhPath);
+        List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
+        toDoTasksService.completeAndAddToDoTask(userIds,toDoTasks,"");
         //节点为待整改时生成整改单
         if (params.containsKey("isFlag") && params.get("isFlag").equals("1") && workflowResultDto.getNextNodeKey().equals(FinancingAuditEnum.待整改.getCode())) {
              if (params.containsKey("isHistory")){

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PeasantHouseholdServiceImpl.java

@@ -18,10 +18,7 @@ import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.PhoneRegisterTypeEum;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.*;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
@@ -30,6 +27,7 @@ import com.yeejoin.amos.boot.module.hygf.api.service.IPeasantHouseholdService;
 import com.yeejoin.amos.boot.module.hygf.api.service.IWxService;
 import com.yeejoin.amos.boot.module.hygf.api.util.BeanDtoUtils;
 import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
+import com.yeejoin.amos.boot.module.hygf.biz.vo.RouthPathVO;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -202,12 +200,16 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         householdContractServiceImpl.addHouseholdContract(householdContract);
 
         //生成待办任务
-        ToDoTasks toDoTasks=  new ToDoTasks (  TaskTypeStationEnum.电站勘察.getCode(),  peasantHousehold.getSequenceNbr(),   "用户"+householdContract.getPartyA()+"电站信息勘察",householdContract.getDealerCode());
-        toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getDeveloperUserId(),toDoTasks,"");
-
-        ToDoTasks toDoTasks1=  new ToDoTasks (  TaskTypeStationEnum.合同填报.getCode(),  householdContract.getSequenceNbr(),  "用户"+householdContract.getPartyA()+"的合同待发起",householdContract.getDealerCode());
-        toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getDeveloperUserId(),toDoTasks1,"");
-
+        List<String> todoUserIds = new ArrayList<>();
+        todoUserIds.add(peasantHousehold.getDeveloperUserId());
+        RouthPathVO routhPathVO = new RouthPathVO();
+        routhPathVO.setRouthPathId(String.valueOf(peasantHousehold.getSequenceNbr()));
+        String routhPath = toDoTasksServiceImpl.getRouthPath(HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
+        ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.电站勘察.getCode(),  peasantHousehold.getSequenceNbr(),   "用户"+householdContract.getPartyA()+"电站信息勘察",householdContract.getDealerCode(),routhPath);
+        toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks);
+
+        ToDoTasks toDoTasks1=  new ToDoTasks (TaskTypeStationEnum.合同填报.getCode(),  householdContract.getSequenceNbr(),  "用户"+householdContract.getPartyA()+"的合同待发起",householdContract.getDealerCode());
+        toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
         return model;
     }
 
@@ -267,7 +269,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
      * 分页查询
      */
 
-    public Page<PeasantHousehold> queryForPeasantHouseholdPage(Page<PeasantHousehold> page,String developerCode, String ownersName,Long developerId, Integer isCertified,String preparationMoneyState, String peasantHouseholdNo,String province,String isHistory,String regionalCompaniesSeq)   {
+    public Page<PeasantHousehold> queryForPeasantHouseholdPage(Page<PeasantHousehold> page,String developerCode, String ownersName,Long developerId, Integer isCertified,String preparationMoneyState, String peasantHouseholdNo,String province,String isHistory,String regionalCompaniesSeq,String routhPathId)   {
         int current = (int)page.getCurrent();
         int size = (int)page.getSize();
 
@@ -278,7 +280,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
             developerId = unitInfo.getAmosCompanySeq();
         }
 
-        List<PeasantHousehold> records = peasantHouseholdMapper.queryForPage( developerCode,ownersName,developerId, isCertified,preparationMoneyState, peasantHouseholdNo,province,isHistory,regionalCompaniesSeq);
+        List<PeasantHousehold> records = peasantHouseholdMapper.queryForPage( developerCode,ownersName,developerId, isCertified,preparationMoneyState, peasantHouseholdNo,province,isHistory,regionalCompaniesSeq,routhPathId);
         PageInfo<PeasantHousehold> objectPageInfo = new PageInfo<PeasantHousehold>(records);
 
 
@@ -958,11 +960,17 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         householdContractServiceImpl.addHouseholdContract(householdContract);
 
         //生成待办任务
-        ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.电站勘察.getCode(), peasantHousehold.getSequenceNbr(), "用户" + householdContract.getPartyA() + "电站信息勘察", householdContract.getDealerCode());
-        toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getDeveloperUserId(), toDoTasks, "");
+        List<String> todoUserIds = new ArrayList<>();
+        todoUserIds.add(peasantHousehold.getDeveloperUserId());
+        RouthPathVO routhPathVO = new RouthPathVO();
+        routhPathVO.setRouthPathId(String.valueOf(peasantHousehold.getSequenceNbr()));
+        String routhPath = toDoTasksServiceImpl.getRouthPath(HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
+        ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.电站勘察.getCode(),  peasantHousehold.getSequenceNbr(),   "用户"+householdContract.getPartyA()+"电站信息勘察",householdContract.getDealerCode(),routhPath);
+        toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks);
+
+        ToDoTasks toDoTasks1=  new ToDoTasks (TaskTypeStationEnum.合同填报.getCode(),  householdContract.getSequenceNbr(),  "用户"+householdContract.getPartyA()+"的合同待发起",householdContract.getDealerCode());
+        toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
 
-        ToDoTasks toDoTasks1 = new ToDoTasks(TaskTypeStationEnum.合同填报.getCode(), householdContract.getSequenceNbr(), "用户" + householdContract.getPartyA() + "的合同待发起", householdContract.getDealerCode());
-        toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getDeveloperUserId(), toDoTasks1, "");
 
         return model;
     }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java

@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
 import com.yeejoin.amos.boot.module.hygf.api.service.IPowerStationService;
 import com.yeejoin.amos.boot.module.hygf.api.util.RedisLockUtil;
 import com.yeejoin.amos.boot.module.hygf.biz.feign.WorkflowFeignClient;
+import com.yeejoin.amos.boot.module.hygf.biz.vo.RouthPathVO;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -98,7 +99,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 	private RedisLockUtil redisLockUtil;
 
 	public Page<PowerStationDto> queryForPowerStationUserRoles(Page<PowerStationDto> page, String powerStationCode,
-															   String ownersName, AgencyUserModel userInfo, String serviceAgent, String regionalCompaniesName, String processStatus,String province, String projectAddress, String status, String startTime, String endTime) {
+															   String ownersName, AgencyUserModel userInfo, String serviceAgent, String regionalCompaniesName, String processStatus,String province, String projectAddress, String status, String startTime, String endTime,String routhPathId) {
 //        Map<Long, List<RoleModel>> orgRoles = userInfo.getOrgRoles();
 //        Collection<List<RoleModel>> roleModels = orgRoles.values();
 //        if(roleModels !=null){
@@ -124,7 +125,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 		// this.queryForPowerStationPage(page,powerStationCode,ownersName,serviceAgent);
 
 		Page<PowerStationDto> powerStationDtoPage = this.queryPage((int) page.getCurrent(), (int) page.getSize(), powerStationCode, ownersName,
-				serviceAgent, regionalCompaniesName, processStatus,province, projectAddress, status, startTime, endTime);
+				serviceAgent, regionalCompaniesName, processStatus,province, projectAddress, status, startTime, endTime,routhPathId);
 
 //		if(powerStationDtoPage.getRecords() != null && powerStationDtoPage.getRecords().size() > 0) {
 //			powerStationDtoPage.getRecords().forEach(e -> {
@@ -170,10 +171,10 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 
 	// 查询电站审核记录
 	public Page<PowerStationDto> queryPage(int current, int size, String powerStationCode, String ownersName,
-										   String serviceAgent,String regionalCompaniesName,String processStatus,String province,String projectAddress, String status, String startTime, String endTime) {
+										   String serviceAgent,String regionalCompaniesName,String processStatus,String province,String projectAddress, String status, String startTime, String endTime,String routhPathId) {
 
 		PageHelper.startPage(current, size);
-		List<PowerStationDto> list = powerStationMapper.queryPage(powerStationCode, ownersName, serviceAgent,regionalCompaniesName,processStatus,province, projectAddress, status, startTime, endTime);
+		List<PowerStationDto> list = powerStationMapper.queryPage(powerStationCode, ownersName, serviceAgent,regionalCompaniesName,processStatus,province, projectAddress, status, startTime, endTime,routhPathId);
 
         PageInfo<PowerStationDto> pages = new PageInfo(list);
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<PowerStationDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<PowerStationDto>();
@@ -222,52 +223,27 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 			Boolean fl = this.saveOrUpdate(powerStation,new LambdaQueryWrapper<PowerStation>()
 					.eq(PowerStation::getPeasantHouseholdId,powerStation.getPeasantHouseholdId()));
 
-			PowerStationNodeEnum powerStationNodeEnum = PowerStationNodeEnum
-					.getNodeByCode(powerStation.getNextProcessNode());
+			PowerStationNodeEnum powerStationNodeEnum = PowerStationNodeEnum.getNodeByCode(powerStation.getNextProcessNode());
 
 			if (flag) {
-
-				ToDoTasks toDoTasks = null;
-				if (PowerStationNodeEnum.经销商上传图纸.getCode().equals(powerStationNodeEnum.getCode())
-						|| PowerStationNodeEnum.经销商审核.getCode().equals(powerStationNodeEnum.getCode())) {
-					// 获取经销商orgcode
-					PeasantHousehold peasantHouseholdd = peasantHouseholdService
-							.getById(powerStation.getPeasantHouseholdId());
-					toDoTasks = new ToDoTasks(TaskTypeStationEnum.电站审核.getCode(), powerStation.getSequenceNbr(),
-							"用户" + name + "电站勘察待" + powerStationNodeEnum.getName(),
-							peasantHouseholdd.getDeveloperCode());
-					if (PowerStationNodeEnum.经销商审核.getCode().equals(powerStationNodeEnum.getCode())) {
-						toDoTasksServiceImpl.addToDoTasksByUserId(peasantHouseholdd.getDeveloperUserId(), toDoTasks,
-								meg);
-					} else {
-						toDoTasksServiceImpl.addToDoTasksByRole(powerStation.getNodeRole(), toDoTasks, meg);
-					}
-				} else {
-					toDoTasks = new ToDoTasks(TaskTypeStationEnum.电站审核.getCode(), powerStation.getSequenceNbr(),
-							"用户" + name + "电站勘察待" + powerStationNodeEnum.getName(), null);
-					toDoTasksServiceImpl.addToDoTasksByRole(powerStation.getNodeRole(), toDoTasks, meg);
+				PeasantHousehold peasantHousehold = peasantHouseholdService.getById(powerStation.getPeasantHouseholdId());
+				RouthPathVO routhPathVO = new RouthPathVO();
+				routhPathVO.setRouthPathId(String.valueOf(powerStation.getSequenceNbr()));
+				String routhPath = toDoTasksServiceImpl.getRouthPath(powerStation.getNextProcessNode(), routhPathVO);
+				if (PowerStationNodeEnum.经销商确认.getCode().equals(powerStationNodeEnum.getCode())) {
+					ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.电站审核.getCode(), powerStation.getSequenceNbr(), "用户" + name + "电站勘察待" + powerStationNodeEnum.getName(), peasantHousehold.getDeveloperCode(),routhPath);
+					List<String> userIds = new ArrayList<>();
+					userIds.add(peasantHousehold.getDeveloperUserId());
+					toDoTasksServiceImpl.addToDoTasksByUserIds(userIds, toDoTasks);
+				}else {
+					ToDoTasks toDoTasks= new ToDoTasks(TaskTypeStationEnum.电站审核.getCode(), powerStation.getSequenceNbr(), "用户" + name + "电站勘察待" + powerStationNodeEnum.getName(), peasantHousehold.getDeveloperCode(),routhPath);
+					String roleId = toDoTasksServiceImpl.getRoleIdByName(powerStation.getNodeRole());
+					List<String> todoUserIds = toDoTasksServiceImpl.getTodoUserIds(null, roleId);
+					toDoTasksServiceImpl.completeAndAddToDoTask(todoUserIds, toDoTasks,meg);
 				}
 			} else {
-				LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
-				wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.电站审核.getCode());
-				wrapper.eq(ToDoTasks::getState, "待办");
-				wrapper.eq(ToDoTasks::getBusinessId, powerStation.getSequenceNbr());
-				ToDoTasks doTasks = toDoTasksMapper.selectOne(wrapper);
-				if (doTasks != null) {
-					doTasks.setState("已办");
-					doTasks.setCompleteTime(new Date());
-
-					toDoTasksMapper.updateById(doTasks);
-					emqKeeper.getMqttClient().publish("TASK_MESSAGE", JSON.toJSONString(doTasks).getBytes(), 2, false);
-
-					UserMessage userMessage = new UserMessage(doTasks.getType(), doTasks.getBusinessId(),
-							doTasks.getAmosUserId(), new Date(), doTasks.getTaskName() + "已完成." + meg,
-							doTasks.getAmosOrgCode());
-					userMessageMapper.insert(userMessage);
-					emqKeeper.getMqttClient().publish("MY_MESSAGE", JSON.toJSONString(userMessage).getBytes(), 2,
-							false);
-
-				}
+				ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.电站审核.getCode(), powerStation.getSequenceNbr());
+				toDoTasksServiceImpl.completeToDoTasks(toDoTasks,meg);
 			}
 
 			return fl;
@@ -439,10 +415,6 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
             powerStation.setNextNodeName(basicGridAcceptance.getNextNodeName());
             powerStationService.savePowerStation(powerStation, flag, powerStation.getOwnersName(), meg);
 
-			//更新待办
-//			WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
-//			workflowResultDto.setInstanceId(powerStation.getProcessInstanceId());
-//			commonService.updateTaskModelAndAddTask(powerStation, workflowResultDto,BusinessTypeEnum.HYGF_DZ_SH);
 			if (!flag) {
 				// 更新农户状态
 				String peasantHouseholdId = powerStation.getPeasantHouseholdId();

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java

@@ -25,6 +25,7 @@ import com.yeejoin.amos.boot.module.hygf.api.service.IHygfPreparationMoneyAuditi
 import com.yeejoin.amos.boot.module.hygf.api.service.IPreparationMoneyService;
 import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
 import com.yeejoin.amos.boot.module.hygf.biz.feign.WorkflowFeignClient;
+import com.yeejoin.amos.boot.module.hygf.biz.vo.RouthPathVO;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -99,6 +100,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
     private HygfReplenishmentMapper hygfReplenishmentMapper;
     @Autowired
     private WorkflowFeignClient workflowFeignClient;
+    @Autowired
+    ToDoTasksServiceImpl toDoTasksServiceImpl;
 
     private static final String regionRedis = "app_region_redis";
 //    private static final String PROCESSKEY = "DeliveryManagement";
@@ -658,14 +661,21 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
                 actWorkflowBatchDTO.setProcess(params);
                 List<ProcessTaskDTO> processTaskDTOS = workFlowService.startBatch(actWorkflowBatchDTO);
                 List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
-                //发起待办
-//                commonService.buildTaskModel(commonService.buildTaskModelDto(model, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_FHGL));
+
+
                 WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
                 HygfPreparationMoneyAuditingDto hygfPreparationMoneyAuditingDto = new HygfPreparationMoneyAuditingDto();
                 BeanUtils.copyProperties(workflowResultDto, hygfPreparationMoneyAuditingDto);
                 hygfPreparationMoneyAuditingDto.setPreparationMoneyId(model.getSequenceNbr());
                 hygfPreparationMoneyAuditingDto.setPromoter(RequestContext.getExeUserId());
                 hygfPreparationMoneyAuditingService.createWithModel(hygfPreparationMoneyAuditingDto);
+                //发起待办
+                RouthPathVO routhPathVO = new RouthPathVO();
+                routhPathVO.setRouthPathId(String.valueOf(model.getSequenceNbr()));
+                String routhPath = toDoTasksServiceImpl.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
+                ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.发货管理.getCode(),  model.getSequenceNbr(),   "下单人"+model.getOrderUser()+"发货待确认",model.getRegionalCompaniesCode(),routhPath);
+                List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
+                toDoTasksServiceImpl.addToDoTasksByUserIds(userIds,toDoTasks);
                 //提交时 赋值发货时间及订单状态
                 model.setDeliveryTime(new Date());
                 model.setDeliveryState(DeliveryStateeEnum.已发货.getName());
@@ -753,14 +763,19 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
                 actWorkflowBatchDTO.setProcess(params);
                 List<ProcessTaskDTO> processTaskDTOS = workFlowService.startBatch(actWorkflowBatchDTO);
                 List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
-                //发起待办
-//                commonService.buildTaskModel(commonService.buildTaskModelDto(model, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_FHGL));
                 WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
                 HygfPreparationMoneyAuditingDto hygfPreparationMoneyAuditingDto = new HygfPreparationMoneyAuditingDto();
                 BeanUtils.copyProperties(workflowResultDto, hygfPreparationMoneyAuditingDto);
                 hygfPreparationMoneyAuditingDto.setPreparationMoneyId(model.getSequenceNbr());
                 hygfPreparationMoneyAuditingDto.setPromoter(RequestContext.getExeUserId());
                 hygfPreparationMoneyAuditingService.createWithModel(hygfPreparationMoneyAuditingDto);
+                //发起待办
+                RouthPathVO routhPathVO = new RouthPathVO();
+                routhPathVO.setRouthPathId(String.valueOf(model.getSequenceNbr()));
+                String routhPath = toDoTasksServiceImpl.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
+                ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.发货管理.getCode(),  model.getSequenceNbr(),   "下单人"+model.getOrderUser()+"发货待确认",model.getRegionalCompaniesCode(),routhPath);
+                List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
+                toDoTasksServiceImpl.addToDoTasksByUserIds(userIds,toDoTasks);
             }else {
                 up.set(PeasantHousehold::getPreparationMoneyState, DeliveryStateeEnum.暂存发货.getCode());
                 up.set(PeasantHousehold::getConstructionState, DeliveryStateeEnum.暂存发货.getCode());
@@ -1031,9 +1046,16 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         ProcessTaskDTO processTaskDTO = workFlowService.complete(hygfPreparationMoneyAuditing.getNextTaskId(), task);
         List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO));
         WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
-        //更新待办
-//        workflowResultDto.setInstanceId(instanceId);
-//        commonService.updateTaskModelAndAddTask(model,workflowResultDto,BusinessTypeEnum.HYGF_FHGL);
+        if( model instanceof PreparationMoney){
+            PreparationMoney preparationMoney = (PreparationMoney) model;
+            //更新待办
+            RouthPathVO routhPathVO = new RouthPathVO();
+            routhPathVO.setRouthPathId(String.valueOf(preparationMoney.getSequenceNbr()));
+            String routhPath = toDoTasksServiceImpl.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
+            ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.发货管理.getCode(),  preparationMoney.getSequenceNbr(),   "下单人"+preparationMoney.getOrderUser()+"发货"+preparationMoney.getOrderStatus(),preparationMoney.getRegionalCompaniesCode(),routhPath);
+            List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
+            toDoTasksServiceImpl.completeAndAddToDoTask(userIds,toDoTasks,"");
+        }
         BeanUtils.copyProperties(workflowResultDto, preparationMoneyAuditpDto);
         preparationMoneyAuditpDto.setPreparationMoneyId(hygfPreparationMoneyAuditing.getPreparationMoneyId());
         preparationMoneyAuditpDto.setPromoter(hygfPreparationMoneyAuditing.getPromoter());
@@ -1201,11 +1223,11 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
 
     }
 
-    public IPage<Map<String,Object>> preparationStation(Integer current, Integer size, String preparationMoneyState,String ownersName,String regionalcompaniesSeq,String developerId,String state,String province, String projectAddress, String startTime, String endTime){
+    public IPage<Map<String,Object>> preparationStation(Integer current, Integer size, String preparationMoneyState,String ownersName,String regionalcompaniesSeq,String developerId,String state,String province, String projectAddress, String startTime, String endTime,String routhPathId){
 
 
          PageHelper.startPage(current,  size);
-         List<Map<String, Object>> resultPage = preparationMoneyMapper.preparationStation(preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state,province, projectAddress, startTime, endTime);
+         List<Map<String, Object>> resultPage = preparationMoneyMapper.preparationStation(preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state,province, projectAddress, startTime, endTime,routhPathId);
 
         if(resultPage != null && resultPage.size() > 0) {
             resultPage.forEach(e -> {

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/RepaymentServiceImpl.java

@@ -134,7 +134,7 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
     @Async
     private void updateTodoTask(String sequenceNbr) {
         Repayment repayment = repaymentMapper.selectById(sequenceNbr);
-        ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.还款.getCode(), repayment.getSequenceNbr(), createTaskName(repayment), repayment.getRegionalCompaniesCode());
+        ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.还款.getCode(), repayment.getSequenceNbr());
         toDoTasksService.completeToDoTasks(toDoTasks, "");
     }
 
@@ -169,10 +169,10 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
                     //生成待办
                     RouthPathVO routhPathVO = new RouthPathVO();
                     routhPathVO.setRouthPathId(String.valueOf(repayment.getSequenceNbr()));
-                    String routhPath = commonService.getRouthPath(BusinessTypeEnum.HYGF_REPAY.getCode(), routhPathVO);
+                    String routhPath = toDoTasksService.getRouthPath(HygfRouthTypeEnum.HYGF_REPAY.getCode(), routhPathVO);
                     ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.还款.getCode(), repayment.getSequenceNbr(), createTaskName(repayment), repayment.getRegionalCompaniesCode(), routhPath);
-                    String sequenceNbr = repaymentMapper.getSequenceNbrByName("户用光伏-投融");
-                    List<String> todoUserIds = repaymentMapper.getTodoUserIds("%" + repayment.getRegionalCompaniesCode() + "%", sequenceNbr);
+                    String roleId = toDoTasksService.getRoleIdByName("户用光伏-投融");
+                    List<String> todoUserIds = toDoTasksService.getTodoUserIds("%" + repayment.getRegionalCompaniesCode() + "%", roleId);
                     toDoTasksService.addToDoTasksByUserIds(todoUserIds, toDoTasks);
                     if (CollectionUtil.isNotEmpty(todoUserIds)){
                         List<String> todoTelephones = repaymentMapper.getTodoTelephones(todoUserIds);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java

@@ -94,7 +94,7 @@ public class SurveyInformationServiceImpl
 	@Autowired
 	PowerStationMapper powerStationMapper;
 	@Autowired
-	ToDoTasksMapper toDoTasksMapper;
+	ToDoTasksServiceImpl toDoTasksService;
 	@Autowired
 	UserMessageMapper userMessageMapper;
 	@Value("${power.station.examine.pageId}")
@@ -305,25 +305,8 @@ public class SurveyInformationServiceImpl
 			} else if (OPERATION_TYPE_APPLY.equals(operationType)) {
 				// 提交审核
 				submitExamine(peasantHousehold);
-				LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
-				wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.电站勘察.getCode());
-				wrapper.eq(ToDoTasks::getState, "待办");
-				wrapper.eq(ToDoTasks::getBusinessId, peasantHousehold.getSequenceNbr());
-				ToDoTasks doTasks = toDoTasksMapper.selectOne(wrapper);
-				if (doTasks != null) {
-					doTasks.setState("已办");
-					doTasks.setCompleteTime(new Date());
-					toDoTasksMapper.updateById(doTasks);
-					emqKeeper.getMqttClient().publish("TASK_MESSAGE", JSON.toJSONString(doTasks).getBytes(), 2, false);
-
-					UserMessage userMessage = new UserMessage(doTasks.getType(), doTasks.getBusinessId(),
-							doTasks.getAmosUserId(), new Date(), doTasks.getTaskName() + "已完成",
-							doTasks.getAmosOrgCode());
-					userMessageMapper.insert(userMessage);
-					emqKeeper.getMqttClient().publish("MY_MESSAGE", JSON.toJSONString(userMessage).getBytes(), 2,
-							false);
-
-				}
+				ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.电站勘察.getCode(), peasantHousehold.getSequenceNbr());
+				toDoTasksService.completeToDoTasks(toDoTasks,"");
 			}
 			peasantHouseholdServiceImpl.saveOrUpdate(peasantHousehold);
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/ToDoTasksServiceImpl.java

@@ -18,12 +18,15 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.UserMessage;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.ToDoTasksMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.UserMessageMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IToDoTasksService;
+import com.yeejoin.amos.boot.module.hygf.api.util.JsonUtils;
 import com.yeejoin.amos.boot.module.hygf.api.util.ListUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,9 +34,14 @@ import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -57,6 +65,8 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
     @Autowired
     Sequence sequence;
 
+    @Value("classpath:/json/hygfRouth.json")
+    private Resource urlInfo;
     final static Logger log = LoggerFactory.getLogger(ToDoTasksServiceImpl.class);
 
     /**
@@ -88,6 +98,19 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
     }
 
     @Transactional
+    @Async
+    public void completeAndAddToDoTask(List<String> userIds,ToDoTasks toDoTasks,String meg) {
+        try {
+            completeToDoTasks(toDoTasks,meg);
+            addToDoTasksByUserIds(userIds,toDoTasks);
+        }catch (Exception e){
+            e.printStackTrace();
+            throw  new BadRequest("任务更新失败！");
+        }
+    }
+
+    @Transactional
+    @Async
     public void completeToDoTasks(ToDoTasks toDoTasks,String meg) {
         try {
             LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
@@ -100,7 +123,7 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
                     doTask.setState("已办");
                     doTask.setCompleteTime(new Date());
                     toDoTasksMapper.updateById(doTask);
-                    emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(doTasks).getBytes(), 2 ,false);
+                    emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(doTask).getBytes(), 2 ,false);
                     UserMessage userMessage=  new UserMessage( doTask.getType(),  doTask.getBusinessId(),  doTask.getAmosUserId(),  new Date(),  doTask.getTaskName()+",此消息已确认."+meg,  doTask.getAmosOrgCode());
                     userMessageMapper.insert(userMessage);
                     emqKeeper.getMqttClient().publish("MY_MESSAGE" ,JSON.toJSONString(userMessage).getBytes(), 2 ,false);
@@ -120,6 +143,7 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
      * @param businessIds
      */
     @Transactional
+    @Async
     public void deleteByBusinessIds(List<String> businessIds) {
         try {
             if(CollectionUtil.isNotEmpty(businessIds)){
@@ -145,6 +169,7 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
     }
 
     @Transactional
+    @Async
     public void addToDoTasksByUserIds(List<String> userIds, ToDoTasks toDoTasks) {
         try {
             if(CollectionUtil.isNotEmpty(userIds)){
@@ -182,7 +207,7 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
             doTasks.setCompleteTime(new Date());
             toDoTasksMapper.updateById(doTasks);
             emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(doTasks).getBytes(), 2 ,false);
-            UserMessage userMessage=  new UserMessage( doTasks.getType(),  doTasks.getBusinessId(),  doTasks.getAmosUserId(),  new Date(),  doTasks.getTaskName()+"已完成."+meg,  doTasks.getAmosOrgCode());
+            UserMessage userMessage=  new UserMessage( doTasks.getType(),  doTasks.getBusinessId(),  doTasks.getAmosUserId(),  new Date(),  doTasks.getTaskName()+",此消息已确认."+meg,  doTasks.getAmosOrgCode());
             userMessageMapper.insert(userMessage);
             emqKeeper.getMqttClient().publish("MY_MESSAGE" ,JSON.toJSONString(userMessage).getBytes(), 2 ,false);
         }
@@ -190,7 +215,7 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
         toDoTasks.setAmosUserId(userId);
         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());
+        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);
         }catch (Exception e){
@@ -279,4 +304,57 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
             }
         }
 
+    public String getRoleIdByName(String groupName) {
+        return toDoTasksMapper.getRoleIdByName(groupName);
+    }
+
+    public List<String> getTodoUserIds(String companyOrgCode, String roleId) {
+        return toDoTasksMapper.getTodoUserIds(companyOrgCode,roleId);
+    }
+
+    //获取路由地址
+    public String getRouthPath(String type,Object model) {
+        List<Map> urlList = JsonUtils.getResourceList(urlInfo);
+        String routhPath="";
+        String urlParams = "";
+        try {
+            urlParams = "&" + toQueryParams(model);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        for (Map map : urlList) {
+            if (map.get("type").equals(type)) {
+                routhPath = (map.get("url").toString() + urlParams);
+                break;
+            }
+        }
+        return routhPath;
+    }
+
+    private  <T> String toQueryParams(T obj) throws UnsupportedEncodingException {
+        StringBuilder sb = new StringBuilder();
+
+        for (Class<?> clazz = obj.getClass(); !clazz.equals(Object.class); clazz = clazz.getSuperclass()) {
+            Field[] fields = clazz.getDeclaredFields();
+
+            for (Field field : fields) {
+                if (!Modifier.isStatic(field.getModifiers())) {
+                    field.setAccessible(true);
+
+                    try {
+                        Object value = field.get(obj);
+
+                        if (value != null && !"".equals(value)) {
+                            String encodedValue = URLEncoder.encode(value.toString(), "UTF-8");
+                            sb.append(field.getName()).append('=').append(encodedValue).append('&');
+                        }
+                    } catch (IllegalAccessException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            }
+        }
+
+        return sb.length() > 0 ? sb.substring(0, sb.length() - 1) : "";
+    }
 }
\ 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/UnitInfoServiceImpl.java

@@ -533,10 +533,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             dealerReview.setFlowTaskId(basicGridAcceptance.getNextTaskId());
             dealerReview.setNodeRole(basicGridAcceptance.getNextExecutorIds());
             dealerReview.setNextProcessNode(DealerReviewEnum.经销商管理员审核.getCode());
-            dealerReviewService.saveDealerReview(dealerReview, true, false, regUnitInfo.getName(), "任务明细：经销商已上传信息");
-            //添加待办
-//            List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
-//            commonService.buildTaskModel(commonService.buildTaskModelDto(dealerReview, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_JXS_SH));
+            dealerReviewService.saveDealerReview(dealerReview, true, false, regUnitInfo.getName(), regUnitInfo.getRegionalCompaniesCode(),"任务明细：经销商已上传信息");
 
         } catch (Exception e){
             throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
@@ -697,13 +694,10 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             ProcessTaskDTO processTaskDTO = workFlowService.standard(basicGridAcceptance, taskResultDTO, amosRequestContext.getUserId());
 
             dealerReview.setFlowTaskId(basicGridAcceptance.getNextTaskId());
-            dealerReviewService.saveDealerReview(dealerReview,false,true,unitInfo.getName(),approvalStatue);
+            dealerReviewService.saveDealerReview(dealerReview,false,true,unitInfo.getName(),unitInfo.getRegionalCompaniesCode(),approvalStatue);
 
             this.saveOrUpdate(unitInfo);
-            //更新待办
-//            WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
-//            workflowResultDto.setInstanceId(dealerReview.getProcessInstanceId());
-//            commonService.updateTaskModelAndAddTask(unitInfo, workflowResultDto,BusinessTypeEnum.HYGF_JXS_SH);
+    
 
 
         }catch (Exception e){

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java

@@ -22,6 +22,7 @@ import com.yeejoin.amos.boot.module.hygf.api.util.BeanDtoUtils;
 import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
 import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
 import com.yeejoin.amos.boot.module.hygf.biz.feign.WorkflowFeignClient;
+import com.yeejoin.amos.boot.module.hygf.biz.vo.RouthPathVO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
@@ -129,7 +130,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	BasicGridAcceptanceServiceImpl basicGridAcceptanceService;
 	@Autowired
 	AcceptanceCheckServiceImpl acceptanceCheckService;
-
+	@Autowired
+	ToDoTasksServiceImpl toDoTasksService;
 	private static final String PROCESSKEY = "ProcessEngineering";
 
 	/**
@@ -379,7 +381,19 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 					hygfWorkOrderStationAuditingDto.setPromoter(RequestContext.getExeUserId());
 					hygfWorkOrderStationAuditingService.createWithModel(hygfWorkOrderStationAuditingDto);
 					//发起待办
-//					commonService.buildTaskModel(commonService.buildTaskModelDto(hygfWorkOrderStationAuditingDto, workflowResultDto, BusinessTypeEnum.HYGF_SGLCSH));
+					WorkOrder workOrder = this.selectOne(powerStationConstructionData.getWorkOrderId());
+					String taskName="派工发料提交完成,需处理";
+					String regionalCompaniesCode="";
+					if(Objects.nonNull(workOrder)){
+						taskName="制单人"+workOrder.getPreparer() +"派工单"+ workOrder.getWorkOrderStatus();
+						regionalCompaniesCode=workOrder.getRegionCode();
+					}
+					RouthPathVO routhPathVO = new RouthPathVO();
+					routhPathVO.setRouthPathId(String.valueOf(powerStationConstructionData.getWorkOrderId()));
+					String routhPath = toDoTasksService.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
+					ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.施工完工.getCode(),  powerStationConstructionData.getWorkOrderPowerStationId(),  taskName, regionalCompaniesCode,routhPath);
+					List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
+					toDoTasksService.addToDoTasksByUserIds(userIds,toDoTasks);
 				}else {
 					this.wofkflowExcute(workOrderStationAuditing.getInstanceId(),"0","通过",BusinessWorkflowKey.施工完成提交.getCode());
 				}
@@ -525,8 +539,20 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		}
 		hygfWorkOrderStationAuditingService.createWithModel(workOrderStationAuditingDto);
 		//更新待办
-//		workflowResultDto.setInstanceId(hygfWorkOrderStationAuditing.getInstanceId());
-//		commonService.updateTaskModelAndAddTask(hygfWorkOrderStationAuditing,workflowResultDto,BusinessTypeEnum.HYGF_SGLCSH);
+		WorkOrderPowerStation workOrderPowerStation = workOrderPowerStationMapper.selectById(hygfWorkOrderStationAuditing.getWorkOrderPowerStationId());
+		WorkOrder workOrder = this.selectOne(workOrderPowerStation.getWorkOrderId());
+		String taskName="";
+		String regionalCompaniesCode="";
+		if(Objects.nonNull(workOrder)){
+			taskName="制单人"+workOrder.getPreparer() +"派工单"+ workflowResultDto.getNextNodeName();
+			regionalCompaniesCode=workOrder.getRegionCode();
+		}
+		RouthPathVO routhPathVO = new RouthPathVO();
+		routhPathVO.setRouthPathId(String.valueOf(hygfWorkOrderStationAuditing.getWorkOrderPowerStationId()));
+		String routhPath = toDoTasksService.getRouthPath(workflowResultDto.getNextNodeKey(), routhPathVO);
+		ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.施工完工.getCode(),  hygfWorkOrderStationAuditing.getWorkOrderPowerStationId(),   taskName,regionalCompaniesCode,routhPath);
+		List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
+		toDoTasksService.completeAndAddToDoTask(userIds,toDoTasks,"");
 	}
 
 	public Page<WorkOrder> selectPage(int pageNum, int pageSize, WorkOrder workOrder) {

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/json/hygfRouth.json

 [
   {
-    "type": "AbarbeitungWaitPush",
-    "pageType": "",
-    "name": "推送融资",
-    "url": "/mixuap?appId=1678340647909617665&id=1774627124162859009"
-  },
-  {
-    "type": "WaitAbarbeitung",
-    "pageType": "",
-    "name": "经销商整改",
-    "url": "/mixuap?appId=1678340647909617665&id=1806150815363108865"
-  },
-  {
-    "type": "FinancingAudit",
-    "pageType": "",
-    "name": "融资审核",
-    "url": "/mixuap?appId=1678340647909617665&id=1775075407041662977"
-  },
-  {
-    "type": "AuditPass",
+    "type": "jxs_03",
     "pageType": "",
-    "name": "线下放款",
-    "url": "/mixuap?appId=1678340647909617665&id=1805852764345995265"
+    "name": "经销商管理员审核",
+    "url": "/mixuap?appId=1678340647909617665&id=1678365817248444417"
   },
   {
-    "type": "jxs_03",
+    "type": "hygf_dzkc",
     "pageType": "",
-    "name": "经销商管理员审核",
-    "url": "/mixuap?appId=1678340647909617665&id=1686219644483956738"
+    "name": "电站勘察",
+    "url": "/mixuap?appId=1677158789557547009&id=1678284514217979905"
   },
   {
     "type": "hygf_02",
     "pageType": "",
     "name": "经销商确认",
-    "url": "/mixuap?appId=1677158789557547009&id=1677158800043307009"
+    "url": "/mixuap?appId=1677158789557547009&id=1783749877520404481"
   },
   {
     "type": "hygf_03",
     "pageType": "",
     "name": "设计审核",
-    "url": "/mixuap?appId=1677158789557547009&id=1680021027779801090"
+    "url": "/mixuap?appId=1678340647909617665&id=1784391744234721281"
   },
   {
     "type": "hygf_05",
     "pageType": "",
     "name": "投融审核",
-    "url": "/mixuap?appId=1677158789557547009&id=1680021027779801090"
+    "url": "/mixuap?appId=1678340647909617665&id=1784391744234721281"
   },
   {
     "type": "hygf_07",
     "pageType": "",
     "name": "法务审核",
-    "url": "/mixuap?appId=1677158789557547009&id=1680021027779801090"
+    "url": "/mixuap?appId=1678340647909617665&id=1784391744234721281"
   },
   {
     "type": "hygf_09",
     "pageType": "",
     "name": "设计上传典型图库",
-    "url": "/mixuap?appId=1677158789557547009&id=1680021027779801090"
+    "url": "/mixuap?appId=1678340647909617665&id=1784391744234721281"
   },
   {
     "type": "hygf_10",
     "pageType": "",
     "name": "经销商设计人员上传设计图",
-    "url": "/mixuap?appId=1677158789557547009&id=1680021027779801090"
+    "url": "/mixuap?appId=1677158789557547009&id=1783750128415281153"
   },
   {
     "type": "hygf_11",
     "pageType": "",
     "name": "设计图纸审核",
-    "url": "/mixuap?appId=1677158789557547009&id=1680021027779801090"
-  },
-  {
-    "type": "hygf_bw1",
-    "pageType": "",
-    "name": "并网登记提交",
-    "url": "/mixuap?appId=1677158789557547009&id=1747156510238076929"
-  },
-  {
-    "type": "hygf_bw2",
-    "pageType": "",
-    "name": "并网管理端工程审核",
-    "url": "/mixuap?appId=1678340647909617665&id=1747528027618701313"
-  },
-  {
-    "type": "hygf_ys1",
-    "pageType": "",
-    "name": "经销商工程提交验收",
-    "url": "/mixuap?appId=1677158789557547009&id=1747168313215053826"
-  },
-  {
-    "type": "hygf_ys2",
-    "pageType": "",
-    "name": "管理端投融审核",
-    "url": "/mixuap?appId=1678340647909617665&id=1747528027618701313"
+    "url": "/mixuap?appId=1678340647909617665&id=1784391744234721281"
   },
   {
-    "type": "hygf_zg_tr",
-    "pageType": "",
-    "name": "整改单",
-    "url": "/mixuap?appId=1677158789557547009&id=1747168313215053826"
-  },
-  {
-    "type": "hygf_ys3",
+    "type": "fh_dtj",
     "pageType": "",
-    "name": "管理端法务审核",
-    "url": "/mixuap?appId=1678340647909617665&id=1747528027618701313"
+    "name": "待发货",
+    "url": "/mixuap?appId=1678340647909617665&id=1802911589028859905"
   },
   {
-    "type": "hygf_zg_fw",
+    "type": "fh_dyr",
     "pageType": "",
-    "name": "整改单",
-    "url": "/mixuap?appId=1677158789557547009&id=1747168313215053826"
+    "name": "待确认",
+    "url": "/mixuap?appId=1677158789557547009&id=1808437079118450689"
   },
   {
-    "type": "hygf_ys4",
+    "type": "fh_dsh",
     "pageType": "",
-    "name": "管理端工程审核",
-    "url": "/mixuap?appId=1678340647909617665&id=1747528027618701313"
+    "name": "待审核",
+    "url": "/mixuap?appId=1678340647909617665&id=1784391442173530113"
   },
   {
-    "type": "hygf_zg_gc",
+    "type": "fh_sqbh",
     "pageType": "",
-    "name": "整改单",
-    "url": "/mixuap?appId=1677158789557547009&id=1747168313215053826"
+    "name": "申请补货",
+    "url": "/mixuap?appId=1677158789557547009&id=1808437079118450689"
   },
   {
-    "type": "hygf_ys5",
+    "type": "Activity_0bs6t4g",
     "pageType": "",
-    "name": "管理端工程是否线下",
-    "url": "/mixuap?appId=1678340647909617665&id=1747528027618701313"
+    "name": "施工完成提交",
+    "url": "/mixuap?appId=1677158789557547009&id=1742435224567967746"
   },
   {
-    "type": "hygf_ys6",
+    "type": "Activity_1spujef",
     "pageType": "",
-    "name": "管理端工程线下验",
-    "url": "/mixuap?appId=1678340647909617665&id=1747528027618701313"
+    "name": "完工登记提交",
+    "url": "/mixuap?appId=1677158789557547009&id=1742435340745994242"
   },
   {
-    "type": "hygf_zg_xx",
+    "type": "Activity_16r1828",
     "pageType": "",
-    "name": "整改单",
-    "url": "/mixuap?appId=1677158789557547009&id=1747168313215053826"
+    "name": "完工自审",
+    "url": "/mixuap?appId=1677158789557547009&id=1742435400158310401"
   },
   {
-    "type": "fh_dtj",
+    "type": "Activity_1bldcno",
     "pageType": "",
-    "name": "待发货",
-    "url": ""
+    "name": "完工自审-片区运营中心",
+    "url": "/mixuap?appId=1678340647909617665&id=1823622039500492802"
   },
   {
-    "type": "fh_dyr",
+    "type": "Activity_1yftt2k",
     "pageType": "",
-    "name": "待确认",
-    "url": ""
+    "name": "工程审核",
+    "url": "/mixuap?appId=1678340647909617665&id=1823622039500492802"
   },
   {
-    "type": "fh_dsh",
+    "type": "Activity_095if3p",
     "pageType": "",
-    "name": "待审核",
-    "url": ""
+    "name": "设计审核",
+    "url": "/mixuap?appId=1678340647909617665&id=1823622039500492802"
   },
   {
-    "type": "fh_sqbh",
+    "type": "hygf_bw1",
     "pageType": "",
-    "name": "申请补货",
-    "url": ""
+    "name": "并网登记提交",
+    "url": "/mixuap?appId=1677158789557547009&id=1747137335817957378"
   },
   {
-    "type": "Activity_0bs6t4g",
+    "type": "Activity_0r2x1es",
     "pageType": "",
-    "name": "下发整改单",
-    "url": ""
+    "name": "经销商管理审核",
+    "url": "/mixuap?appId=1677158789557547009&id=1747137335817957378"
   },
   {
-    "type": "Activity_0ku0pw4",
+    "type": "Activity_05nlkey",
     "pageType": "",
-    "name": "填写整改单",
-    "url": ""
+    "name": "片区审核",
+    "url": "/mixuap?appId=1678340647909617665&id=1827892888785129474"
   },
   {
-    "type": "Activity_0e6eabb",
+    "type": "Activity_0k4o46e",
     "pageType": "",
-    "name": "整改单审核",
-    "url": ""
+    "name": "设计审核/工程审核",
+    "url": "/mixuap?appId=1678340647909617665&id=1827892888785129474"
   },
   {
     "type": "Activity_0bs6t4g",
     "pageType": "",
     "name": "验收提交",
-    "url": ""
+    "url": "/mixuap?appId=1677158789557547009&id=1828973864328105986"
   },
   {
     "type": "Activity_0ojajec",
     "pageType": "",
     "name": "经销商管理员审核",
-    "url": ""
+    "url": "/mixuap?appId=1677158789557547009&id=1828973864328105986"
   },
   {
     "type": "Activity_0edftmv",
     "pageType": "",
     "name": "片区审核",
-    "url": ""
+    "url": "/mixuap?appId=1678340647909617665&id=1828979740128579585"
   },
   {
     "type": "Activity_1rjn5s1",
     "pageType": "",
     "name": "投融/法务审核",
-    "url": ""
+    "url": "/mixuap?appId=1678340647909617665&id=1828979740128579585"
   },
   {
     "type": "Activity_0rbc0gc",
     "pageType": "",
     "name": "资产审核",
-    "url": ""
-  },
-  {
-    "type": "Activity_0bs6t4g",
-    "pageType": "",
-    "name": "并网登记",
-    "url": ""
-  },
-  {
-    "type": "Activity_0r2x1es",
-    "pageType": "",
-    "name": "经销商管理审核",
-    "url": ""
-  },
-  {
-    "type": "Activity_05nlkey",
-    "pageType": "",
-    "name": "片区审核",
-    "url": ""
+    "url": "/mixuap?appId=1678340647909617665&id=1828979740128579585"
   },
   {
-    "type": "Activity_0k4o46e",
-    "pageType": "",
-    "name": "设计审核/工程审核",
-    "url": ""
-  },
-  {
-    "type": "Activity_0bs6t4g",
-    "pageType": "",
-    "name": "施工完成提交",
-    "url": ""
-  },
-  {
-    "type": "Activity_1spujef",
-    "pageType": "",
-    "name": "完工登记提交",
-    "url": ""
-  },
-  {
-    "type": "Activity_16r1828",
+    "type": "AbarbeitungWaitPush",
     "pageType": "",
-    "name": "完工自审",
-    "url": ""
+    "name": "推送融资",
+    "url": "/mixuap?appId=1677158789557547009&id=1776873272973987842"
   },
   {
-    "type": "Activity_1bldcno",
+    "type": "WaitAbarbeitung",
     "pageType": "",
-    "name": "完工自审-片区运营中心",
-    "url": ""
+    "name": "经销商重新提交验收/退回建档",
+    "url": "/mixuap?appId=1677158789557547009&id=1776873272973987842"
   },
   {
-    "type": "Activity_1yftt2k",
+    "type": "FinancingAudit",
     "pageType": "",
-    "name": "工程审核",
-    "url": ""
+    "name": "融资审核",
+    "url": "/mixuap?appId=1678340647909617665&id=1774974009419501569"
   },
   {
-    "type": "Activity_095if3p",
+    "type": "AuditPass",
     "pageType": "",
-    "name": "设计审核",
-    "url": ""
+    "name": "放款确认",
+    "url": "/mixuap?appId=1678340647909617665&id=1831228592361574401"
   },
   {
     "type": "hygf_repayment",