Merge remote-tracking branch 'origin/developer_bw' into developer_bw

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

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

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

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+
+@Getter
+@AllArgsConstructor
+public enum CommonEnum {
+
+    居民("居民","jm","业主类型"),
+    非居民("非居民","fjm","业主类型"),
+    自建资产("自建资产","zx","电站类型"),
+    经销商代建("经销商代建","fzx","电站类型"),
+    平顶屋("平顶屋","pdw","屋顶类型"),
+    斜顶屋("斜顶屋","xdw","屋顶类型"),
+    庭院("ty","other","屋顶类型"),
+    别墅("别墅","bs","房屋整体情况"),
+    普通民房("普通民房","pymf","房屋整体情况"),
+    单门独院("单门独院","dmdy","房屋整体情况"),
+    一栋多户("一栋多户","yddh","房屋整体情况"),
+    一户一表("一户一表","yhyb","电表位置"),
+    集中电表("集中电表","jzdb","电表位置"),
+    南偏东("南偏东","npd","房屋偏向"),
+    南偏西("南偏西","npx","房屋偏向"),
+    正南("正南","zn","房屋偏向"),
+    移除遮挡物("移除遮挡物","yczdw","解决措施"),
+    设计规避("设计规避","sjgb","解决措施"),
+    公共共有("公共共有","gy","房屋产权情况"),
+    按份共有("按份共有","br","房屋产权情况"),
+    单独所有("单独所有","dy","房屋产权情况"),
+    高树("高树","gs","周边障碍物"),
+    建筑物("建筑物","jzw","周边障碍物"),
+    电线杆("电线杆","dxg","周边障碍物"),
+    带电线路("带电线路","ddxl","周边障碍物"),
+    变压器("变压器","byq","周边障碍物"),
+    阳台("阳台","yt","上至屋顶通道"),
+    孔洞("孔洞","kd","上至屋顶通道"),
+    楼梯间("楼梯间","ltj","上至屋顶通道"),
+    女儿墙("女儿墙","nrq","屋面遮挡物"),
+    热水器("热水器","rsq","屋面遮挡物"),
+    烟囱("烟囱","yc","屋面遮挡物"),
+    老虎窗("老虎窗","lhc","屋面遮挡物"),
+    水箱("水箱","sx","屋面遮挡物"),
+    无("无","wu","屋面遮挡物"),
+    无需防滑雪措施("无需防滑雪措施","wxfhxcs","防滑雪措施"),
+    预留防滑雪缓冲通道("预留防滑雪缓冲通道","ylfhxhctd","防滑雪措施"),
+    安装挡雪夹具("安装挡雪夹具","azdxjj","防滑雪措施"),
+    自然人("自然人","zrr","商务类型"),
+    非自然人("非自然人","fzrr","商务类型"),
+    宅基地农户屋顶("宅基地农户屋顶","zjdnhw","法务类型"),
+    法人私有的宅基地建筑屋顶("法人私有的宅基地建筑屋顶","frsydzjd","法务类型"),
+    单晶("单晶","danjing","组件类型"),
+    多晶("多晶","duojing","组件类型"),
+    不限("不限","bx","逆变器系列"),
+    全额上网("全额上网","qesw","上网模式"),
+    余电上网("余电上网","ydsw","上网模式"),
+    单相("单相","dx","相位"),
+    三相("三相","ydsw","相位"),
+    SMC("SMC","smc","材质"),
+    不锈钢("不锈钢","bxg","材质"),
+    钢板喷塑("钢板喷塑","gbps","材质"),
+    其他("其他","other","公用");
+
+    /**
+     * 名称，描述
+     */
+    private String name;
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 编码
+     */
+    private String type;
+
+
+    public static String getNameByCode(String code) {
+        String name = null;
+        for(CommonEnum obj: CommonEnum.values()) {
+            if (obj.getCode().equals(code)) {
+                name = obj.getName();
+                break;
+            }
+        }
+        return StringUtils.isEmpty(name)?code:name;
+    }
+
+    public static String getNameByCodeList(List<String> codes) {
+
+
+        String name = null;
+        for (String code : codes) {
+            for(CommonEnum obj: CommonEnum.values()) {
+                if (obj.getCode().equals(code)) {
+                    name =     name == null?obj.getName(): name +","+obj.getName() ;
+                }
+            }
+        }
+        return StringUtils.isEmpty(name)? String.valueOf(codes) :name;
+    }
+}

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

@@ -12,7 +12,7 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum RepaymentMessageStateEnum {
     UN_CONFIRM(0,"待确认"),
-    CONFIRM(1,"确认");
+    CONFIRM(1,"已确认");
     /**
      * 编码
      */

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

@@ -9,7 +9,8 @@ public enum  TaskTypeStationEnum {
     电站审核("电站审核", "电站审核"),
     合同填报("合同填报", "合同填报"),
     重置密码("重置密码", "重置密码"),
-    设置管理员("设置管理员", "设置管理员");
+    设置管理员("设置管理员", "设置管理员"),
+    还款("还款", "还款");
     /**
      * 名称，描述
      */

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class RepaymentBatchDto {
+    private List<String> sequenceNbrList;
+}

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

@@ -92,7 +92,8 @@ public class SurveyInformationDto extends BaseDto {
 
     @ApiModelProperty(value = "项目地址")
     private String projectAddressName;
-
+    @ApiModelProperty(value = "常住地址")
+    private String permanentAddressName;
     @ApiModelProperty(value = "常住地址code")
     @TableField(typeHandler = FastjsonTypeHandler.class)
     private List<Integer> permanentAddress;

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

+package com.yeejoin.amos.boot.module.hygf.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName(value = "privilege_company",autoResultMap = true)
+public class PrivilegeCompany extends BaseEntity {
+    @TableField("COMPANY_NAME")
+    private String companyName;
+    @TableField("COMPANY_CODE")
+    private String companyCode;
+    @TableField("DESCRIPTION")
+    private String description;
+    @TableField("PARENT_ID")
+    private Long parentId;
+    @TableField("REGION_SEQ")
+    private String regionSeq;
+    @TableField("`LEVEL`")
+    private String level;
+    @TableField("EMAIL")
+    private String email;
+    @TableField("LONGITUDE")
+    private String longitude;
+    @TableField("LATITUDE")
+    private String latitude;
+    @TableField("CONTACT")
+    private String contact;
+    @TableField("LANDLINE_PHONE")
+    private String landlinePhone;
+    @TableField("ADDRESS")
+    private String address;
+    @TableField("COMPANY_ORG_CODE")
+    private Integer companyOrgCode;
+    @TableField("ORG_CODE")
+    private String orgCode;
+    @TableField("AGENCY_CODE")
+    private String agencyCode;
+    @TableField("COMPANY_TYPE")
+    private String companyType;
+    @TableField("SUPER_ORG_CODE")
+    private String superOrgCode;
+    @TableField(exist = false)
+    private String text;
+
+}

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

@@ -7,8 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.sql.Date;
 import java.time.LocalDate;
-import java.util.Date;
 
 /**
  *
@@ -84,6 +84,14 @@ public class Repayment extends BaseEntity {
      */
     @TableField("cron_send_state")
     private Integer cronSendState;
-
-
+    /**
+     * 还款提交时间
+     */
+    @TableField("repay_commit_time")
+    private Date repayCommitTime;
+    /**
+     * 消息确认时间
+     */
+    @TableField("message_commit_time")
+    private Date messageCommitTime;
 }

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

@@ -71,7 +71,11 @@ public class ToDoTasks extends BaseEntity {
     @TableField("amos_org_code")
     private String amosOrgCode;
 
-
+    /**
+     *路由地址
+     */
+    @TableField("route_path")
+    private String routePath;
 
 
     public ToDoTasks(String type, Long businessId,  String taskName,String orgCode) {
@@ -83,6 +87,16 @@ public class ToDoTasks extends BaseEntity {
         this.taskName = taskName;
     }
 
+    public ToDoTasks(String type, Long businessId,  String taskName,String orgCode,String routePath) {
+        this.type = type;
+        this.businessId = businessId;
+        this.state = "待办";
+        this.amosOrgCode = orgCode;
+        this.creationTime = new Date();
+        this.taskName = taskName;
+        this.routePath = routePath;
+    }
+
     public ToDoTasks() {
     }
 }

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

@@ -10,5 +10,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @date 2024-08-21
  */
 public interface BasicGridAuditingMapper extends BaseMapper<BasicGridAuditing> {
+    String getInstanceIdByhouseId(String peasantHouseholdId);
 
 }

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

@@ -11,5 +11,5 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.FinancingAuditing;
  * @date 2024-04-01
  */
 public interface FinancingAuditingMapper extends BaseMapper<FinancingAuditing> {
-
+    String getInstanceIdByhouseId(String peasantHouseholdId);
 }

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

@@ -10,5 +10,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @date 2024-08-08
  */
 public interface HygfWorkOrderStationAuditingMapper extends BaseMapper<HygfWorkOrderStationAuditing> {
+    String getInstanceIdByhouseId(String peasantHouseholdId);
 
 }

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

@@ -22,4 +22,6 @@ public interface PowerStationMapper extends BaseMapper<PowerStation> {
 			@Param("ownersName") String ownersName, @Param("serviceAgent") String serviceAgent,
 			@Param("regionalCompaniesName") String regionalCompaniesName, @Param("processStatus") String processStatus,
 			@Param("province") String province);
+
+	String getInstanceIdByhouseId(String peasantHouseholdId);
 }

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

@@ -3,7 +3,9 @@ package com.yeejoin.amos.boot.module.hygf.api.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.RepaymentDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.PrivilegeCompany;
 import com.yeejoin.amos.boot.module.hygf.api.entity.Repayment;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -15,5 +17,23 @@ import java.util.List;
  */
 public interface RepaymentMapper extends BaseMapper<Repayment> {
     @UserEmpower(field = {"regional_companies_code"}, dealerField = {"regional_companies_code"}, fieldConditions = {"in"}, relationship = "and")
-    List<RepaymentDto> queryPage();
+    List<RepaymentDto> queryPage(@Param("sequenceNbr") String sequenceNbr, @Param("companyName")String companyName, @Param("loanPeriod")String loanPeriod,
+                                 @Param("messageState")String messageState, @Param("repayState")String repayState,@Param("repayDate")String repayDate,@Param("period")String period);
+
+    /**
+     * 获取区域公司通过OrgCode
+     * @param orgCode
+     * @return
+     */
+    PrivilegeCompany getPrivilegeCompanyByOrgCode(@Param("orgCode")String orgCode);
+
+    /**
+     * 根据角色和区域公司获取用户Id
+     * @param companyOrgCode
+     * @param roleId
+     * @return
+     */
+    List<String> getTodoUserIds(@Param("companyOrgCode") String companyOrgCode, @Param("roleId") String roleId);
+
+    String getSequenceNbrByName(@Param("groupName") String groupName);
 }

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

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAuditingMapper">
 
+
+    <select id="getInstanceIdByhouseId" resultType="java.lang.String">
+        select instance_id From hygf_basic_grid_auditing where peasant_household_id  = #{peasantHouseholdId} Limit 1
+
+    </select>
 </mapper>

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.FinancingAuditingMapper">
+    <select id="getInstanceIdByhouseId" resultType="java.lang.String">
+        select instance_id From hygf_financing_auditing where peasant_household_id  = #{peasantHouseholdId} Limit 1
 
+    </select>
 </mapper>

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

@@ -2,4 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.HygfWorkOrderStationAuditingMapper">
 
+    <select id="getInstanceIdByhouseId" resultType="java.lang.String">
+        select instance_id From hygf_work_order_station_auditing where power_station_id  = #{peasantHouseholdId} Limit 1
+
+    </select>
 </mapper>

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

@@ -39,4 +39,7 @@
 <!--    GROUP BY hygf_peasant_household.sequence_nbr-->
     ORDER BY hygf_power_station.rec_date desc
 </select>
+    <select id="getInstanceIdByhouseId" resultType="java.lang.String">
+        select process_instance_id From hygf_power_station where peasant_household_id  = #{peasantHouseholdId}
+    </select>
 </mapper>

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

@@ -4,6 +4,47 @@
 
     <select id="queryPage" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.RepaymentDto">
         select * from hygf_repayment
-        order by rec_date DESC
+        <where>
+            <if test="sequenceNbr != null and sequenceNbr != ''">
+                and sequence_nbr = #{sequenceNbr}
+            </if>
+            <if test="companyName != null and companyName != ''">
+                and company_name like CONCAT('%',#{companyName},'%' )
+            </if>
+            <if test="loanPeriod != null and loanPeriod != ''">
+                and loan_period like CONCAT('%',#{loanPeriod},'%' )
+            </if>
+            <if test="repayDate != null and repayDate != ''">
+                and repay_date = #{repayDate}
+            </if>
+            <if test="period != null and period != ''">
+                and period like CONCAT('%',#{period},'%' )
+            </if>
+            <if test="messageState != null and messageState != ''">
+                and message_state = #{messageState}
+            </if>
+            <if test="repayState != null and repayState != ''">
+                and repay_state = #{repayState}
+            </if>
+        </where>
+        order by rec_date DESC,sequence_nbr DESC
     </select>
+
+    <select id="getPrivilegeCompanyByOrgCode"
+            resultType="com.yeejoin.amos.boot.module.hygf.api.entity.PrivilegeCompany">
+        SELECT * FROM privilege_company
+        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="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-biz/pom.xml

@@ -42,6 +42,11 @@
           <scope>compile</scope>
       </dependency>
       <dependency>
+          <groupId>com.google.code.gson</groupId>
+          <artifactId>gson</artifactId>
+          <version>2.8.9</version>
+      </dependency>
+      <dependency>
           <groupId>org.springframework.boot</groupId>
           <artifactId>spring-boot-starter-activemq</artifactId>
           <version>2.5.4</version>

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.google.common.net.HttpHeaders;
 import com.yeejoin.amos.boot.module.hygf.api.dto.CommerceInfoDto;
+import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.FinancingInfoServiceImpl;
 import io.swagger.annotations.Api;
@@ -35,6 +37,7 @@ public class CommonController {
     }
 
 
+
     /**
      * 设备信息下载
      *
@@ -43,17 +46,30 @@ public class CommonController {
     @GetMapping(value = "/downInformation")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "资料下载", notes = "资料下载")
-    public void downList(HttpServletResponse response,@RequestParam(required = false) String surveyInformationId,
-                         @RequestParam(required = false)String peasantHouseholdId,
-                         @RequestParam(required = false)String processInstanceId) {
+    public void downList(HttpServletResponse response, @RequestParam(required = false) String surveyInformationId,
+                         @RequestParam(required = false)List<String> peasantHouseholdIds,
+                         @RequestParam(required = false)String processInstanceId) throws IOException {
 
+// 设置响应头
+        response.setContentType("application/zip");
 
-            commonService.downZiliao(surveyInformationId,peasantHouseholdId,processInstanceId);
 
+        commonService.downZiliao(surveyInformationId,peasantHouseholdIds,processInstanceId,response);
 
     }
 
+    /**
+     * 设备信息下载
+     *
+     * @return
+     */
+    @GetMapping(value = "/getSchedule")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "资料下载进度获取", notes = "资料下载进度获取")
+    public ResponseModel<Object> getSchedule(String peasantHouseholdId) {
 
+      return ResponseHelper.buildResponse(commonService.getSchedule(peasantHouseholdId));
 
 
+    }
 }

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.RepaymentCronSendStateEnum;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.RepaymentMessageStateEnum;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.RepaymentRepayStateEnum;
+import com.yeejoin.amos.boot.module.hygf.api.dto.RepaymentBatchDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.RepaymentDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.Repayment;
 import com.yeejoin.amos.boot.module.hygf.api.util.FileUtil;
@@ -21,6 +20,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -55,14 +55,11 @@ public class RepaymentController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-    public ResponseModel<RepaymentDto> save(@RequestBody RepaymentDto model) {
-        model.setCronSendState(RepaymentCronSendStateEnum.SEND.getCode());
-        model.setMessageState(RepaymentMessageStateEnum.UN_CONFIRM.getCode());
-        model.setRepayState(RepaymentRepayStateEnum.UN_REPAY.getCode());
-        model = repaymentService.createWithModel(model);
-        return ResponseHelper.buildResponse(model);
+    @PostMapping(value = "/addOrUpdate")
+    @ApiOperation(httpMethod = "POST", value = "新增或编辑", notes = "新增或编辑")
+    public ResponseModel<RepaymentDto> addOrUpdate(@RequestBody RepaymentDto model) {
+        repaymentService.addOrUpdate(model);
+        return ResponseHelper.buildResponse(null);
     }
 
     /**
@@ -74,7 +71,7 @@ public class RepaymentController extends BaseController {
     @PutMapping(value = "/updateBySequenceNbr")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
     public ResponseModel<?> updateBySequenceNbr(@RequestBody Repayment model) {
-        repaymentService.updateById(model);
+        repaymentService.updateBySequenceNbr(model);
         return ResponseHelper.buildResponse(null);
     }
 
@@ -99,7 +96,7 @@ public class RepaymentController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PutMapping(value = "/repayBySequenceNbr")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr还款", notes = "根据sequenceNbr还款")
-    public ResponseModel<?> batchRepay(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
+    public ResponseModel<?> repayBySequenceNbr(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
         repaymentService.repay(sequenceNbr);
         return ResponseHelper.buildResponse(null);
     }
@@ -112,8 +109,8 @@ public class RepaymentController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/batchConfirmMessageState")
     @ApiOperation(httpMethod = "POST", value = "根据sequenceNbr批量确认消息", notes = "根据sequenceNbr批量确认消息")
-    public ResponseModel<?> batchConfirmMessageState(@RequestBody List<Long> sequenceNbrList) {
-        repaymentService.batchConfirmMessageState(sequenceNbrList);
+    public ResponseModel<?> batchConfirmMessageState(@RequestBody RepaymentBatchDto repaymentBatchDto) {
+        repaymentService.batchConfirmMessageState(repaymentBatchDto.getSequenceNbrList());
         return ResponseHelper.buildResponse(null);
     }
 
@@ -125,8 +122,8 @@ public class RepaymentController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/batchRepay")
     @ApiOperation(httpMethod = "POST", value = "根据sequenceNbr批量还款", notes = "根据sequenceNbr批量还款")
-    public ResponseModel<?> batchRepay(@RequestBody List<Long> sequenceNbrList) {
-        repaymentService.batchRepay(sequenceNbrList);
+    public ResponseModel<?> batchRepay(@RequestBody RepaymentBatchDto repaymentBatchDto) {
+        repaymentService.batchRepay(repaymentBatchDto.getSequenceNbrList());
         return ResponseHelper.buildResponse(null);
     }
 
@@ -138,8 +135,15 @@ public class RepaymentController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "batchDelete")
     @ApiOperation(httpMethod = "POST", value = "根据sequenceNbr批量删除", notes = "根据sequenceNbr批量删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(@RequestBody List<Long> sequenceNbrList) {
-        return ResponseHelper.buildResponse(repaymentService.deleteBatchSeq(sequenceNbrList));
+    public ResponseModel<Boolean> deleteBySequenceNbr(@RequestBody RepaymentBatchDto repaymentBatchDto) {
+        List<String> sequenceNbrList = repaymentBatchDto.getSequenceNbrList();
+        List<Long> list = new ArrayList<>();
+        if (CollectionUtil.isNotEmpty(sequenceNbrList)) {
+            for (String s : sequenceNbrList) {
+                list.add(Long.valueOf(s));
+            }
+        }
+        return ResponseHelper.buildResponse(repaymentService.deleteBatchSeq(list));
     }
 
     /**
@@ -151,8 +155,7 @@ public class RepaymentController extends BaseController {
     @PostMapping(value = "importRepaymentExcel")
     @ApiOperation(httpMethod = "POST", value = "导入还款模板Excel", notes = "导入还款模板Excel")
     public ResponseModel<?> importRepaymentExcel(@RequestPart("file") MultipartFile file) {
-        AgencyUserModel userInfo = getUserInfo();
-        repaymentService.importRepaymentExcel(file, userInfo);
+        repaymentService.importRepaymentExcel(file);
         return ResponseHelper.buildResponse(null);
     }
 
@@ -164,8 +167,8 @@ public class RepaymentController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "exportRepaymentExcel")
     @ApiOperation(httpMethod = "POST", value = "导出还款模板Excel", notes = "导出还款模板Excel")
-    public ResponseModel<?> exportRepaymentExcel(@RequestBody List<Long> sequenceNbrList, HttpServletResponse response) {
-        repaymentService.exportRepaymentExcel(sequenceNbrList, response);
+    public ResponseModel<?> exportRepaymentExcel(@RequestBody RepaymentBatchDto repaymentBatchDto, HttpServletResponse response) {
+        repaymentService.exportRepaymentExcel(repaymentBatchDto.getSequenceNbrList(), response);
         return ResponseHelper.buildResponse(null);
     }
 
@@ -213,8 +216,15 @@ public class RepaymentController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
-    public ResponseModel<Page<RepaymentDto>> queryForPage(@RequestParam(value = "current") int current,
+    public ResponseModel<Page<RepaymentDto>> queryForPage(@RequestParam(value = "sequenceNbr",required = false) String sequenceNbr,
+                                                          @RequestParam(value = "companyName",required = false) String companyName,
+                                                          @RequestParam(value = "loanPeriod",required = false) String loanPeriod,
+                                                          @RequestParam(value = "messageState",required = false) String messageState,
+                                                          @RequestParam(value = "repayState",required = false) String repayState,
+                                                          @RequestParam(value = "repayDate",required = false) String repayDate,
+                                                          @RequestParam(value = "period",required = false) String period,
+                                                          @RequestParam(value = "current") int current,
                                                           @RequestParam(value = "size") int size) {
-        return ResponseHelper.buildResponse(repaymentService.queryForRepaymentPage(current, size));
+        return ResponseHelper.buildResponse(repaymentService.queryForRepaymentPage(sequenceNbr, companyName,loanPeriod,messageState,repayState,repayDate,period,current, size));
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/feign/TaskV2FeignService.java

@@ -35,6 +35,28 @@ public interface TaskV2FeignService {
      * @return TaskV2Model
      * @throws InnerInvokException e
      */
+    @RequestMapping(value = "/batch/addString", method = RequestMethod.POST)
+    FeignClientResult<List<TaskV2Model>> batchAddString(@RequestBody String modelList) throws InnerInvokException;
+
+    /**
+     * 批量新增任务
+     *
+     * @param modelList 新增待办
+     * @return TaskV2Model
+     * @throws InnerInvokException e
+     */
+    @RequestMapping(value = "/batch/addString", method = RequestMethod.POST)
+    FeignClientResult<List<TaskV2Model>> batchAddStringNew(@RequestHeader(name = "appKey", required = true) String appKey,
+                                                     @RequestHeader(name = "product", required = true) String product,
+                                                     @RequestHeader(name = "token", required = true) String token,
+                                                     @RequestBody String modelList) throws InnerInvokException;
+    /**
+     * 批量新增任务
+     *
+     * @param modelList 新增待办
+     * @return TaskV2Model
+     * @throws InnerInvokException e
+     */
     @RequestMapping(value = "/batch/add", method = RequestMethod.POST)
     FeignClientResult<List<TaskV2Model>> batchAddNew(@RequestHeader(name = "appKey", required = true) String appKey,
                                                      @RequestHeader(name = "product", required = true) String product,
@@ -87,4 +109,10 @@ public interface TaskV2FeignService {
      */
     @RequestMapping(value = "/batch/update", method = RequestMethod.PUT)
     FeignClientResult<List<TaskV2Model>> batchUpdate(@RequestBody List<TaskV2Model> modelList) throws InnerInvokException;
+
+    /**
+     * 批量修改任务
+     */
+    @RequestMapping(value = "/batch/updateString", method = RequestMethod.PUT)
+    FeignClientResult<List<TaskV2Model>> batchUpdateString(@RequestBody String modelList) throws InnerInvokException;
 }

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

@@ -173,8 +173,8 @@ 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));
+//            workflowResultDto.setInstanceId(basicGridRecord.getInstanceId());
+//            commonService.buildTaskModel(commonService.buildTaskModelDto(basicGridRecord, workflowResultDto, BusinessTypeEnum.HYGF_YSLC));
         }
 
         //防止重复提交
@@ -233,8 +233,8 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
         }
         acceptanceCheckAuditingService.createWithModel(basicGridAuditingDto);
         //更新待办
-        workflowResultDto.setInstanceId(basicGridAuditingDto.getInstanceId());
-        commonService.updateTaskModelAndAddTask(basicGridAuditingDto,workflowResultDto,BusinessTypeEnum.HYGF_YSLC);
+//        workflowResultDto.setInstanceId(basicGridAuditingDto.getInstanceId());
+//        commonService.updateTaskModelAndAddTask(basicGridAuditingDto,workflowResultDto,BusinessTypeEnum.HYGF_YSLC);
     }
 
 

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

@@ -153,9 +153,9 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
             taskResultDTO.setTaskId(basicGridAcceptance.getNextTaskId());
             ProcessTaskDTO processTaskDTO = workFlowService.standard(basicGridAcceptance, taskResultDTO, userId);
             //更新待办
-            WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
-            workflowResultDto.setInstanceId(basicGridAcceptance.getInstanceId());
-            commonService.updateTaskModelAndAddTask(basicGridAcceptance, workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
+//            WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
+//            workflowResultDto.setInstanceId(basicGridAcceptance.getInstanceId());
+//            commonService.updateTaskModelAndAddTask(basicGridAcceptance, workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
             basicGridAcceptanceMapper.updateById(basicGridAcceptance);
             }
         } finally {

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

@@ -149,9 +149,9 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
             taskResultDTO.setTaskId(basicGridAcceptanc.getNextTaskId());
             ProcessTaskDTO processTaskDTO = workFlowService.standard(basicGridAcceptanc, taskResultDTO, userId);
             //发起待办
-            WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
-            workflowResultDto.setInstanceId(basicGridAcceptanc.getInstanceId());
-            updateAcceptanceTask(basicGridAcceptanc, workflowResultDto);
+//            WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
+//            workflowResultDto.setInstanceId(basicGridAcceptanc.getInstanceId());
+//            commonService.updateTaskModelAndAddTask(basicGridAcceptanc, workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
             basicGridAcceptanceMapper.updateById(basicGridAcceptanc);
 
             //线上验收
@@ -165,17 +165,4 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
         }
     }
 
-    private void updateAcceptanceTask(BasicGridAcceptance basicGridAcceptance, WorkflowResultDto workflowResultDto) {
-        Map<String, Object> updateTaskParam = new HashMap<>();
-        updateTaskParam.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
-        updateTaskParam.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-        updateTaskParam.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
-        updateTaskParam.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-        updateTaskParam.put("model", basicGridAcceptance);
-        updateTaskParam.put("relationId", workflowResultDto.getInstanceId());
-        commonService.updateTaskModel(updateTaskParam);
-        commonService.buildTaskModel((commonService.buildTaskModelDto(basicGridAcceptance, workflowResultDto, BusinessTypeEnum.HYGF_BWYS)));
-    }
-
-
 }

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

@@ -252,8 +252,8 @@ 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));
+//			workflowResultDto.setInstanceId(basicGridRecord.getInstanceId());
+//			commonService.buildTaskModel(commonService.buildTaskModelDto(basicGridRecord, workflowResultDto, BusinessTypeEnum.HYGF_BWLC));
 		}
 
 		// 防止重复提交
@@ -450,9 +450,9 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 
 			basicGridAcceptanceMapper.updateById(basicGridAcceptanc);
 			//更新待办
-			WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
-			workflowResultDto.setInstanceId(basicGridAcceptanc.getInstanceId());
-			commonService.updateTaskModelAndAddTask(basicGridAcceptanc,workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
+//			WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
+//			workflowResultDto.setInstanceId(basicGridAcceptanc.getInstanceId());
+//			commonService.updateTaskModelAndAddTask(basicGridAcceptanc,workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
 		} finally {
 			redisLockUtil.releaseLock(lockName);
 		}
@@ -493,8 +493,8 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 		}
 		basicGridAuditingService.createWithModel(basicGridAuditingDto);
 		//更新待办
-		workflowResultDto.setInstanceId(basicGridAuditingDto.getInstanceId());
-		commonService.updateTaskModelAndAddTask(basicGridAuditingDto,workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
+//		workflowResultDto.setInstanceId(basicGridAuditingDto.getInstanceId());
+//		commonService.updateTaskModelAndAddTask(basicGridAuditingDto,workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
 	}
 
 	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/FinancingInfoServiceImpl.java

@@ -208,10 +208,10 @@ 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));
+//                    FinancingInfo newFinancingInfo = new FinancingInfo();
+//                    BeanUtils.copyProperties(model, newFinancingInfo);
+//                    newFinancingInfo.setStatus(FinancingAuditEnum.待融资审核.getName());
+//                    commonService.buildTaskModel(commonService.buildTaskModelDto(newFinancingInfo, workflowResultDto, BusinessTypeEnum.HYGF_DZTRRZ));
                 }
                 //批量 兼容审核不通过及整改待推送
                 else if (financingInfos.getStatus().equals(FinancingAuditEnum.审核不通过.getName()) || financingInfos.getStatus().equals("待推送")   ){
@@ -262,7 +262,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
             this.deleteBySeq(financingInfo.getSequenceNbr());
         }
         //停止流程
-        commonService.deleteTaskModel(processId);
+//        commonService.deleteTaskModel(processId);
     }
 
     @Override
@@ -340,8 +340,8 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
 
         this.updateById(financingInfo);
         //更新待办
-        workflowResultDto.setInstanceId(financingAuditing.getInstanceId());
-        commonService.updateTaskModelAndAddTask(financingInfo,workflowResultDto,BusinessTypeEnum.HYGF_DZTRRZ);
+//        workflowResultDto.setInstanceId(financingAuditing.getInstanceId());
+//        commonService.updateTaskModelAndAddTask(financingInfo,workflowResultDto,BusinessTypeEnum.HYGF_DZTRRZ);
         //节点为待整改时生成整改单
         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/PowerStationServiceImpl.java

@@ -421,12 +421,12 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
             powerStation.setPromoter(basicGridAcceptance.getPromoter());
             powerStation.setNextExecuteUserIds(basicGridAcceptance.getNextExecuteUserIds());
             powerStation.setNextNodeName(basicGridAcceptance.getNextNodeName());
-
+            powerStationService.savePowerStation(powerStation, flag, powerStation.getOwnersName(), meg);
+            
 			//更新待办
-			WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
-			workflowResultDto.setInstanceId(powerStation.getProcessInstanceId());
-			updatePowerStationTask(powerStation, workflowResultDto);
-			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();
@@ -534,17 +534,6 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 //        return code;
 	}
 
-    private void updatePowerStationTask(PowerStation powerStation, WorkflowResultDto workflowResultDto) {
-        Map<String, Object> updateTaskParam = new HashMap<>();
-        updateTaskParam.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
-        updateTaskParam.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-        updateTaskParam.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
-        updateTaskParam.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-        updateTaskParam.put("model", powerStation);
-        updateTaskParam.put("relationId", workflowResultDto.getInstanceId());
-        commonService.updateTaskModel(updateTaskParam);
-        commonService.buildTaskModel((commonService.buildTaskModelDto(powerStation, workflowResultDto, BusinessTypeEnum.HYGF_DZ_SH)));
-    }
 
 
     public WorkDto getNodeInfoCode(String flowTaskId) {

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

@@ -667,7 +667,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
                 List<ProcessTaskDTO> processTaskDTOS = workFlowService.startBatch(actWorkflowBatchDTO);
                 List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
                 //发起待办
-                commonService.buildTaskModel(commonService.buildTaskModelDto(model, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_FHGL));
+//                commonService.buildTaskModel(commonService.buildTaskModelDto(model, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_FHGL));
                 WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
                 HygfPreparationMoneyAuditingDto hygfPreparationMoneyAuditingDto = new HygfPreparationMoneyAuditingDto();
                 BeanUtils.copyProperties(workflowResultDto, hygfPreparationMoneyAuditingDto);
@@ -762,7 +762,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
                 List<ProcessTaskDTO> processTaskDTOS = workFlowService.startBatch(actWorkflowBatchDTO);
                 List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
                 //发起待办
-                commonService.buildTaskModel(commonService.buildTaskModelDto(model, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_FHGL));
+//                commonService.buildTaskModel(commonService.buildTaskModelDto(model, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_FHGL));
                 WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
                 HygfPreparationMoneyAuditingDto hygfPreparationMoneyAuditingDto = new HygfPreparationMoneyAuditingDto();
                 BeanUtils.copyProperties(workflowResultDto, hygfPreparationMoneyAuditingDto);
@@ -1040,8 +1040,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO));
         WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
         //更新待办
-        workflowResultDto.setInstanceId(instanceId);
-        commonService.updateTaskModelAndAddTask(model,workflowResultDto,BusinessTypeEnum.HYGF_FHGL);
+//        workflowResultDto.setInstanceId(instanceId);
+//        commonService.updateTaskModelAndAddTask(model,workflowResultDto,BusinessTypeEnum.HYGF_FHGL);
         BeanUtils.copyProperties(workflowResultDto, preparationMoneyAuditpDto);
         preparationMoneyAuditpDto.setPreparationMoneyId(hygfPreparationMoneyAuditing.getPreparationMoneyId());
         preparationMoneyAuditpDto.setPromoter(hygfPreparationMoneyAuditing.getPromoter());
@@ -1086,8 +1086,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
         workflowResultDto.setInstanceId(hygfPreparationMoneyAuditing.getInstanceId());
         //更新待办
-        workflowResultDto.setInstanceId(preparationMoney.getInstanceId());
-        commonService.updateTaskModelAndAddTask(preparationMoney,workflowResultDto,BusinessTypeEnum.HYGF_FHGL);
+//        workflowResultDto.setInstanceId(preparationMoney.getInstanceId());
+//        commonService.updateTaskModelAndAddTask(preparationMoney,workflowResultDto,BusinessTypeEnum.HYGF_FHGL);
         HygfPreparationMoneyAuditingDto preparationMoneyAuditpDto = new HygfPreparationMoneyAuditingDto();
         BeanUtils.copyProperties(workflowResultDto, preparationMoneyAuditpDto);
         preparationMoneyAuditpDto.setPreparationMoneyId(sequenceNbr);

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

@@ -94,7 +94,7 @@ public class RectificationOrderAuditingServiceImpl extends BaseService<Rectifica
             rectificationOrderAuditingDto.setPromoter(RequestContext.getExeUserId());
             this.createWithModel(rectificationOrderAuditingDto);
             //发起待办
-            commonService.buildTaskModel(commonService.buildTaskModelDto(rectificationOrderAuditingDto, workflowResultDto, BusinessTypeEnum.HYGF_ZGDSHLC));
+//            commonService.buildTaskModel(commonService.buildTaskModelDto(rectificationOrderAuditingDto, workflowResultDto, BusinessTypeEnum.HYGF_ZGDSHLC));
 
         }
     }
@@ -130,8 +130,8 @@ public class RectificationOrderAuditingServiceImpl extends BaseService<Rectifica
         }
         this.createWithModel(rectificationOrderAuditingDto);
         //更新待办
-        workflowResultDto.setInstanceId(rectificationOrderAuditing.getInstanceId());
-        commonService.updateTaskModelAndAddTask(rectificationOrderAuditing,workflowResultDto,BusinessTypeEnum.HYGF_ZGDSHLC);
+//        workflowResultDto.setInstanceId(rectificationOrderAuditing.getInstanceId());
+//        commonService.updateTaskModelAndAddTask(rectificationOrderAuditing,workflowResultDto,BusinessTypeEnum.HYGF_ZGDSHLC);
     }
 
 

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

@@ -352,16 +352,16 @@ public class SurveyInformationServiceImpl
 		return code;
 	}
 
-    private void updateSurveyInformationTask(PowerStation powerStation, String instanceId) {
-        Map<String, Object> updateTaskParam = new HashMap<>();
-        updateTaskParam.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
-        updateTaskParam.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-        updateTaskParam.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
-        updateTaskParam.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-        updateTaskParam.put("model", powerStation);
-        updateTaskParam.put("relationId", instanceId);
-        commonService.updateTaskModel(updateTaskParam);
-    }
+//    private void updateSurveyInformationTask(PowerStation powerStation, String instanceId) {
+//        Map<String, Object> updateTaskParam = new HashMap<>();
+//        updateTaskParam.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+//        updateTaskParam.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+//        updateTaskParam.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+//        updateTaskParam.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+//        updateTaskParam.put("model", powerStation);
+//        updateTaskParam.put("relationId", instanceId);
+//        commonService.updateTaskModel(updateTaskParam);
+//    }
 
 	private void submitExamine(PeasantHousehold peasantHousehold) {
 
@@ -397,7 +397,7 @@ public class SurveyInformationServiceImpl
                 ProcessTaskDTO processTaskDTO = workFlowService.standard(basicGridAcceptance, taskResultDTO, requestContext.getUserId());
 
                 basicGridAcceptance.setInstanceId(powerStation.getProcessInstanceId());
-                updateSurveyInformationTask(powerStation, powerStation.getProcessInstanceId());
+//                updateSurveyInformationTask(powerStation, powerStation.getProcessInstanceId());
                 processTaskDTOS.add(processTaskDTO);
             } else {
                 // 第一步启动工作流
@@ -458,9 +458,9 @@ public class SurveyInformationServiceImpl
 			up.eq(PeasantHousehold::getSequenceNbr, idsk);
 			peasantHouseholdMapper.update(null, up);
             //添加待办
-            WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(processTaskDTOS).get(0);
-            workflowResultDto.setInstanceId(powerStation.getProcessInstanceId());
-            commonService.buildTaskModel(commonService.buildTaskModelDto(powerStation, workflowResultDto, BusinessTypeEnum.HYGF_DZ_SH));
+//            WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(processTaskDTOS).get(0);
+//            workflowResultDto.setInstanceId(powerStation.getProcessInstanceId());
+//            commonService.buildTaskModel(commonService.buildTaskModelDto(powerStation, workflowResultDto, BusinessTypeEnum.HYGF_DZ_SH));
 		} catch (Exception e) {
 			e.printStackTrace();
 			log.error("submitExamine error:", e);

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.hygf.api.dto.TasksRole;
@@ -14,6 +16,7 @@ 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 org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -47,6 +50,8 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
 
     @Autowired
     protected EmqKeeper emqKeeper;
+    @Autowired
+    Sequence sequence;
 
     final static Logger log = LoggerFactory.getLogger(ToDoTasksServiceImpl.class);
 
@@ -78,7 +83,54 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
         return toDoTasksPage;
     }
 
+    @Transactional
+    public void completeToDoTasks(ToDoTasks toDoTasks,String meg) {
+        try {
+            LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(ToDoTasks::getType, toDoTasks.getType());
+            wrapper.eq(ToDoTasks::getState, "待办");
+            wrapper.eq(ToDoTasks::getBusinessId, toDoTasks.getBusinessId());
+            List<ToDoTasks> doTasks= toDoTasksMapper.selectList(wrapper);
+            if(CollectionUtils.isNotEmpty(doTasks)){
+                for (ToDoTasks doTask : doTasks) {
+                    doTask.setState("已办");
+                    doTask.setCompleteTime(new Date());
+                    toDoTasksMapper.updateById(doTask);
+                    emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(doTasks).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);
+                }
+            }else {
+                log.error("没有查询到待办,不进行更新和发送消息");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            throw  new BadRequest("任务更新失败！");
+        }
+    }
 
+    @Transactional
+    public void addToDoTasksByUserIds(List<String> userIds, ToDoTasks toDoTasks) {
+        try {
+            if(CollectionUtil.isNotEmpty(userIds)){
+                for (String todoUserId : userIds) {
+                    toDoTasks.setAmosUserId(todoUserId);
+                    toDoTasks.setSequenceNbr(sequence.nextId());
+                    toDoTasksMapper.insert(toDoTasks);
+                    emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(toDoTasks).getBytes(), 2 ,false);
+                    UserMessage userMessage=  new UserMessage( toDoTasks.getType(),  toDoTasks.getBusinessId(),  toDoTasks.getAmosUserId(),  new Date(),  toDoTasks.getTaskName(),  toDoTasks.getAmosOrgCode());
+                    userMessageMapper.insert(userMessage);
+                    emqKeeper.getMqttClient().publish("MY_MESSAGE" ,JSON.toJSONString(userMessage).getBytes(), 2 ,false);
+                }
+            }else {
+                log.error("用户为空,不进行添加待办和发送消息");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            throw  new BadRequest("任务添加失败！");
+        }
+    }
 
     @Override
     @Transactional

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

@@ -536,8 +536,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             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));
+//            List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
+//            commonService.buildTaskModel(commonService.buildTaskModelDto(dealerReview, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_JXS_SH));
 
         } catch (Exception e){
             throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
@@ -702,9 +702,9 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
 
             this.saveOrUpdate(unitInfo);
             //更新待办
-            WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
-            workflowResultDto.setInstanceId(dealerReview.getProcessInstanceId());
-            updateUnitInfoTask(unitInfo, workflowResultDto);
+//            WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
+//            workflowResultDto.setInstanceId(dealerReview.getProcessInstanceId());
+//            commonService.updateTaskModelAndAddTask(unitInfo, workflowResultDto,BusinessTypeEnum.HYGF_JXS_SH);
 
 
         }catch (Exception e){
@@ -845,18 +845,6 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
         return code;
     }
 
-        private void updateUnitInfoTask(UnitInfo unitInfo, WorkflowResultDto workflowResultDto) {
-        Map<String, Object> updateTaskParam = new HashMap<>();
-        updateTaskParam.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
-        updateTaskParam.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-        updateTaskParam.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
-        updateTaskParam.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-        updateTaskParam.put("model", unitInfo);
-        updateTaskParam.put("relationId", workflowResultDto.getInstanceId());
-        commonService.updateTaskModel(updateTaskParam);
-        commonService.buildTaskModel((commonService.buildTaskModelDto(unitInfo, workflowResultDto, BusinessTypeEnum.HYGF_JXS_SH)));
-    }
-
     @Override
     public IPage<CompanyDto> getCompanyDto(CompanyDto dto) {
         //列表数据组装

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

@@ -381,7 +381,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 					hygfWorkOrderStationAuditingDto.setPromoter(RequestContext.getExeUserId());
 					hygfWorkOrderStationAuditingService.createWithModel(hygfWorkOrderStationAuditingDto);
 					//发起待办
-					commonService.buildTaskModel(commonService.buildTaskModelDto(hygfWorkOrderStationAuditingDto, workflowResultDto, BusinessTypeEnum.HYGF_SGLCSH));
+//					commonService.buildTaskModel(commonService.buildTaskModelDto(hygfWorkOrderStationAuditingDto, workflowResultDto, BusinessTypeEnum.HYGF_SGLCSH));
 				}else {
 					this.wofkflowExcute(workOrderStationAuditing.getInstanceId(),"0","通过",BusinessWorkflowKey.施工完成提交.getCode());
 				}
@@ -517,8 +517,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		}
 		hygfWorkOrderStationAuditingService.createWithModel(workOrderStationAuditingDto);
 		//更新待办
-		workflowResultDto.setInstanceId(hygfWorkOrderStationAuditing.getInstanceId());
-		commonService.updateTaskModelAndAddTask(hygfWorkOrderStationAuditing,workflowResultDto,BusinessTypeEnum.HYGF_SGLCSH);
+//		workflowResultDto.setInstanceId(hygfWorkOrderStationAuditing.getInstanceId());
+//		commonService.updateTaskModelAndAddTask(hygfWorkOrderStationAuditing,workflowResultDto,BusinessTypeEnum.HYGF_SGLCSH);
 	}
 
 	public Page<WorkOrder> selectPage(int pageNum, int pageSize, WorkOrder workOrder) {

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/vo/RepaymentExcelVO.java

@@ -20,29 +20,29 @@ import java.time.LocalDate;
 public class RepaymentExcelVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
-    @ApiModelProperty(value = "公司名称")
-    @Excel(name = "公司名称", width = 50, orderNum = "1")
+    @ApiModelProperty(value = "区域公司")
+    @Excel(name = "区域公司", width = 50, orderNum = "1")
     private String companyName;
 
     @ApiModelProperty(value = "期次")
     @Excel(name = "期次", width = 30, orderNum = "2")
     private String period;
 
-    @ApiModelProperty(value = "还款时间")
-    @Excel(name = "还款时间", width = 30, orderNum = "3")
+    @ApiModelProperty(value = "还款日期")
+    @Excel(name = "还款日期", width = 30, orderNum = "3")
     private LocalDate repayDate;
 
-    @ApiModelProperty(value = "租金")
-    @Excel(name = "租金", width = 30, orderNum = "4")
-    private Double rent;
+    @ApiModelProperty(value = "租金(元)")
+    @Excel(name = "租金(元)", width = 30, orderNum = "4")
+    private String rent;
 
-    @ApiModelProperty(value = "利息")
-    @Excel(name = "利息", width = 30, orderNum = "5")
-    private Double interest;
+    @ApiModelProperty(value = "利息(元)")
+    @Excel(name = "利息(元)", width = 30, orderNum = "5")
+    private String interest;
 
-    @ApiModelProperty(value = "本金")
-    @Excel(name = "本金", width = 30, orderNum = "6")
-    private Double principal;
+    @ApiModelProperty(value = "本金(元)")
+    @Excel(name = "本金(元)", width = 30, orderNum = "6")
+    private String principal;
 
     @ApiModelProperty(value = "放款批次")
     @Excel(name = "放款批次", width = 30, orderNum = "7")

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/vo/RouthPathVO.java

+package com.yeejoin.amos.boot.module.hygf.biz.vo;
+
+import lombok.Data;
+
+/**
+ * 路由地址跳转需要的实体
+ */
+@Data
+public class RouthPathVO {
+    private String routhPathId;
+}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application.properties

@@ -87,3 +87,5 @@ exception.debug=true
 feign.okhttp.enabled= true
 
 workflow.feign.name=AMOS-API-WORKFLOW-CZ
+repaymentCron=0 0 1 * * ?
+urlHttp=http://47.92.234.253:8088
\ No newline at end of file

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",
+    "pageType": "",
+    "name": "线下放款",
+    "url": "/mixuap?appId=1678340647909617665&id=1805852764345995265"
+  },
+  {
+    "type": "jxs_03",
+    "pageType": "",
+    "name": "经销商管理员审核",
+    "url": "/mixuap?appId=1678340647909617665&id=1686219644483956738"
+  },
+  {
+    "type": "hygf_02",
+    "pageType": "",
+    "name": "经销商确认",
+    "url": "/mixuap?appId=1677158789557547009&id=1677158800043307009"
+  },
+  {
+    "type": "hygf_03",
+    "pageType": "",
+    "name": "设计审核",
+    "url": "/mixuap?appId=1677158789557547009&id=1680021027779801090"
+  },
+  {
+    "type": "hygf_05",
+    "pageType": "",
+    "name": "投融审核",
+    "url": "/mixuap?appId=1677158789557547009&id=1680021027779801090"
+  },
+  {
+    "type": "hygf_07",
+    "pageType": "",
+    "name": "法务审核",
+    "url": "/mixuap?appId=1677158789557547009&id=1680021027779801090"
+  },
+  {
+    "type": "hygf_09",
+    "pageType": "",
+    "name": "设计上传典型图库",
+    "url": "/mixuap?appId=1677158789557547009&id=1680021027779801090"
+  },
+  {
+    "type": "hygf_10",
+    "pageType": "",
+    "name": "经销商设计人员上传设计图",
+    "url": "/mixuap?appId=1677158789557547009&id=1680021027779801090"
+  },
+  {
+    "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"
+  },
+  {
+    "type": "hygf_zg_tr",
+    "pageType": "",
+    "name": "整改单",
+    "url": "/mixuap?appId=1677158789557547009&id=1747168313215053826"
+  },
+  {
+    "type": "hygf_ys3",
+    "pageType": "",
+    "name": "管理端法务审核",
+    "url": "/mixuap?appId=1678340647909617665&id=1747528027618701313"
+  },
+  {
+    "type": "hygf_zg_fw",
+    "pageType": "",
+    "name": "整改单",
+    "url": "/mixuap?appId=1677158789557547009&id=1747168313215053826"
+  },
+  {
+    "type": "hygf_ys4",
+    "pageType": "",
+    "name": "管理端工程审核",
+    "url": "/mixuap?appId=1678340647909617665&id=1747528027618701313"
+  },
+  {
+    "type": "hygf_zg_gc",
+    "pageType": "",
+    "name": "整改单",
+    "url": "/mixuap?appId=1677158789557547009&id=1747168313215053826"
+  },
+  {
+    "type": "hygf_ys5",
+    "pageType": "",
+    "name": "管理端工程是否线下",
+    "url": "/mixuap?appId=1678340647909617665&id=1747528027618701313"
+  },
+  {
+    "type": "hygf_ys6",
+    "pageType": "",
+    "name": "管理端工程线下验",
+    "url": "/mixuap?appId=1678340647909617665&id=1747528027618701313"
+  },
+  {
+    "type": "hygf_zg_xx",
+    "pageType": "",
+    "name": "整改单",
+    "url": "/mixuap?appId=1677158789557547009&id=1747168313215053826"
+  },
+  {
+    "type": "fh_dtj",
+    "pageType": "",
+    "name": "待发货",
+    "url": ""
+  },
+  {
+    "type": "fh_dyr",
+    "pageType": "",
+    "name": "待确认",
+    "url": ""
+  },
+  {
+    "type": "fh_dsh",
+    "pageType": "",
+    "name": "待审核",
+    "url": ""
+  },
+  {
+    "type": "fh_sqbh",
+    "pageType": "",
+    "name": "申请补货",
+    "url": ""
+  },
+  {
+    "type": "Activity_0bs6t4g",
+    "pageType": "",
+    "name": "下发整改单",
+    "url": ""
+  },
+  {
+    "type": "Activity_0ku0pw4",
+    "pageType": "",
+    "name": "填写整改单",
+    "url": ""
+  },
+  {
+    "type": "Activity_0e6eabb",
+    "pageType": "",
+    "name": "整改单审核",
+    "url": ""
+  },
+  {
+    "type": "Activity_0bs6t4g",
+    "pageType": "",
+    "name": "验收提交",
+    "url": ""
+  },
+  {
+    "type": "Activity_0ojajec",
+    "pageType": "",
+    "name": "经销商管理员审核",
+    "url": ""
+  },
+  {
+    "type": "Activity_0edftmv",
+    "pageType": "",
+    "name": "片区审核",
+    "url": ""
+  },
+  {
+    "type": "Activity_1rjn5s1",
+    "pageType": "",
+    "name": "投融/法务审核",
+    "url": ""
+  },
+  {
+    "type": "Activity_0rbc0gc",
+    "pageType": "",
+    "name": "资产审核",
+    "url": ""
+  },
+  {
+    "type": "Activity_0bs6t4g",
+    "pageType": "",
+    "name": "并网登记",
+    "url": ""
+  },
+  {
+    "type": "Activity_0r2x1es",
+    "pageType": "",
+    "name": "经销商管理审核",
+    "url": ""
+  },
+  {
+    "type": "Activity_05nlkey",
+    "pageType": "",
+    "name": "片区审核",
+    "url": ""
+  },
+  {
+    "type": "Activity_0k4o46e",
+    "pageType": "",
+    "name": "设计审核/工程审核",
+    "url": ""
+  },
+  {
+    "type": "Activity_0bs6t4g",
+    "pageType": "",
+    "name": "施工完成提交",
+    "url": ""
+  },
+  {
+    "type": "Activity_1spujef",
+    "pageType": "",
+    "name": "完工登记提交",
+    "url": ""
+  },
+  {
+    "type": "Activity_16r1828",
+    "pageType": "",
+    "name": "完工自审",
+    "url": ""
+  },
+  {
+    "type": "Activity_1bldcno",
+    "pageType": "",
+    "name": "完工自审-片区运营中心",
+    "url": ""
+  },
+  {
+    "type": "Activity_1yftt2k",
+    "pageType": "",
+    "name": "工程审核",
+    "url": ""
+  },
+  {
+    "type": "Activity_095if3p",
+    "pageType": "",
+    "name": "设计审核",
+    "url": ""
+  },
+  {
+    "type": "hygf_repayment",
+    "pageType": "",
+    "name": "还款管理",
+    "url": "/mixuap?appId=1678340647909617665&id=1846106343904120833"
+  }
+]
\ No newline at end of file

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

@@ -5,22 +5,8 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.text.Collator;
 import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -687,8 +673,12 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 			time.add(DateUtil.format(indicatorData.getCreatedTime(), "HH:mm"));
 			if ("FDZ".equals(stationBasic.getStationType())) {
 				values.add(String.format(CommonConstans.Twodecimalplaces, indicatorData.getValueF()));
+				Double value = groupMap.get(indicatorData.getCreatedTime());
+				if (Objects.isNull(value)){
+					value= 0.0;
+				}
 				valueList.add(
-						String.format(CommonConstans.Twodecimalplaces, groupMap.get(indicatorData.getCreatedTime())));
+						String.format(CommonConstans.Twodecimalplaces,value));
 			} else {
 				values.add(String.format(CommonConstans.Twodecimalplaces,
 						indicatorData.getValueF() * CommonConstans.kwToMv));
@@ -743,7 +733,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 					JSON.toJSON(otherInfo).toString().getBytes("UTF-8"), 1, true);
 			log.info("---------------------推送全站图表信息结束------------------------------");
 		} catch (Exception exception) {
-			log.info("---------------------推送全站图表信息失败------------------------------");
+			log.error("---------------------推送全站图表信息失败------------------------------");
 		}
 
 	}