修改代码 增加注释

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

@@ -8,16 +8,18 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum FinancingAuditEnum {
 
-    待融资审核("FinancingAudit","待融资审核"),
-    审核不通过("AuditReject","整改待推送"),
-    待整改("WaitAbarbeitung","待整改"),
-    整改待推送("AbarbeitungWaitPush","审核不通过"),
-    审核通过("AuditPass","审核通过"),
-    放款完成("complete","放款完成");
+    待融资审核("FinancingAudit","待融资审核","/hygf/drzsh"),
+    审核不通过("AuditReject","整改待推送","/hygf/zgdts"),
+    待整改("WaitAbarbeitung","待整改","/hygf/dzg"),
+    整改待推送("AbarbeitungWaitPush","审核不通过","/hygf/shym"),
+    审核通过("AuditPass","审核通过","/hygf/fkym"),
+    放款完成("complete","放款完成","");
 
 
     private String code;
     private String name;
+    //路由r
+    private  String routing;
     /**
      * 编码
      */
@@ -33,5 +35,16 @@ public enum FinancingAuditEnum {
           return name;
         }
 
+        public static String  getNodeByCode(String code){
+        String rout = null;
+
+          for (FinancingAuditEnum value : FinancingAuditEnum.values()) {
+              if (value.getCode().equals(code)){
+                  rout= value.getRouting();
+              }
+          }
+          return rout;
+        }
+
 
 }

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

@@ -29,8 +29,9 @@ public class FinancingRectificationOrderDto  extends BaseDto {
     @ApiModelProperty(value = "农户id")
     private Long peasantHouseholdId;
 
+
    @ApiModelProperty(value = "农户名称")
-   private String ownersName;
+   private String peasantHouseholdName;
    @ApiModelProperty(value = "农户编号")
    private String peasantHouseholdNo;
    @ApiModelProperty(value = "地址")

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

@@ -12,7 +12,7 @@
         hph.regional_companies_name AS regionalCompaniesName,
         IFNULL( info.`status`, '待推送' ) AS status,
         (select count( hfro.sequence_nbr ) from  hygf_financing_rectification_order hfro where  hfro.peasant_household_id = hph.sequence_nbr  )orderNum,
-        (select instance_id FROM  hygf_financing_auditing  WHERE hygf_financing_auditing.peasant_household_id = hph.sequence_nbr ORDER BY rec_date desc limit 1) instanceId,
+        (select CONCAT_WS(',',instance_id,node_routing) instanceId FROM  hygf_financing_auditing  WHERE hygf_financing_auditing.peasant_household_id = hph.sequence_nbr ORDER BY rec_date desc limit 1) instanceId,
         hygf_unit_info.head_name responsibleUserName,
         hygf_unit_info.head_phone  responsibleUserPhone
         FROM
@@ -24,24 +24,24 @@
         <if test="params.ownersName != null and params.ownersName !=''">
             and hph.owners_name like concat('%',#{params.ownersName},'%')
         </if>
-        <if test="params.regionalCompaniesSeq != null and params.regionalCompaniesSeq !=''">
-            and hph.regional_companies_seq = #{params.regionalCompaniesSeq}
+        <if test="params.regionalCompaniesCode != null and params.regionalCompaniesCode !=''">
+            and hph.regional_companies_code = #{params.regionalCompaniesCode}
+        </if>
+      <if test="params.type == 1 ">
+          and hph.regional_companies_code in
+              <foreach collection="amosOrgCodes" item="item" open="(" close=")" separator=",">
+           #{item}
+       </foreach>
         </if>
-<!--      <if test="params.type == 1 ">-->
-<!--          and hph.regional_companies_code in-->
-<!--              <foreach collection="amosOrgCodes" item="item" open="(" close=")" separator=",">-->
-<!--           #{item}-->
-<!--       </foreach>-->
-<!--        </if>-->
         <if test="params.type == 2 ">
-            and info.status in ('待融资审核','审核通过','放款完成' )
+            and info.status in ('待融资审核','审核通过','放款完成' ) and info.financing_companies_seq = #{params.financingCompaniesSeq}
         </if>
         <if test="params.type == 3 ">
             and info.status in ('待整改')
-<!--          and hph.developer_code in-->
-<!--       <foreach collection="amosOrgCodes" item="item" open="(" close=")" separator=",">-->
-<!--           #{item}-->
-<!--       </foreach>-->
+          and hph.regional_companies_code in
+       <foreach collection="amosOrgCodes" item="item" open="(" close=")" separator=",">
+           #{item}
+       </foreach>
           </if>
         <if test="params.status != null and params.status != ''">
             and info.status = #{params.status}

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

@@ -116,12 +116,12 @@ public class FinancingInfoController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
 	public ResponseModel<Page<Map<String, Object>>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size,@RequestParam(value = "type") String type,
 																 @RequestParam(value = "status",required = false) String status,
-																 @RequestParam(value = "regionalCompaniesSeq" ,required = false) String regionalCompaniesSeq ,
+																 @RequestParam(value = "regionalCompaniesCode" ,required = false) String regionalCompaniesCode ,
 																 @RequestParam(value = "ownersName",required = false) String ownersName){
 	    Page<Map<String, Object>> page = new Page<Map<String, Object>>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(financingInfoServiceImpl.queryForFinancingInfoPage(page,type,status,regionalCompaniesSeq,ownersName));
+	    return ResponseHelper.buildResponse(financingInfoServiceImpl.queryForFinancingInfoPage(page,type,status,regionalCompaniesCode,ownersName));
 	}
 
 	/**

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -64,30 +66,35 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto,Finan
 
 
     @UserLimits
-    public Page<Map<String, Object>> queryForFinancingInfoPage(Page<Map<String, Object>> page,String type,String status,String regionalCompaniesSeq ,String ownersName)   {
+    public Page<Map<String, Object>> queryForFinancingInfoPage(Page<Map<String, Object>> page,String type,String status,String regionalCompaniesCode ,String ownersName)   {
         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();
         Map<String, Object> params = new HashMap<>();
         params.put("ownersName",ownersName);
         params.put("status",status);
-        params.put("regionalCompaniesSeq",regionalCompaniesSeq);
+        params.put("regionalCompaniesCode",regionalCompaniesCode);
         params.put("type",type);
+        // 1 投融人员  2.融资  3经销商管理员
         switch (type){
             case "1":
-              //  params.put("amosOrgCode",amosOrgCodes);
                 break;
             case "2":
                 Long sequenceNbr = reginParams.getCompany().getSequenceNbr();
                 params.put("financingCompaniesSeq", String.valueOf(sequenceNbr));
-
                 break;
             default:
-              //  params.put("amosOrgCode",amosOrgCode);
-
+                amosOrgCodes=Arrays.asList(orgCode.getAdminRegionalCompaniesCode().split(","));
         }
         PageHelper.startPage((int)page.getCurrent(),(int)page.getSize());
         List<Map<String, Object>> list = financingInfoMapper.getStationFinancingInfoList(params,amosOrgCodes);
+        list.forEach(e->{
+            if (null != e.get("instanceId") && e.get("instanceId").toString().contains(",")){
+                String[] instanceIds = e.get("instanceId").toString().split(",");
+                e.put("instanceId",instanceIds[0]);
+                e.put("nodeRouting",instanceIds[1]);
+            }
+        });
         PageInfo<Map<String, Object>> infos = new PageInfo<>(list);
         page.setRecords(list);
         page.setTotal(infos.getTotal());
@@ -136,7 +143,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto,Finan
             dto.setProcessDefinitionKey(PROCESSKEY);
             dto.setBusinessKey(String.valueOf(new Date().getTime()));
             dto.setCompleteFirstTask(true);
-
+            //工作流程图第一步执行后存在互斥网关 isFlag为表达式 默认为1执行到融资审核
             HashMap<String, Object> map = new HashMap<>();
             map.put("isFlag","1");
             dto.setVariables(map);
@@ -201,6 +208,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto,Finan
         HashMap<String, Object> map = new HashMap<>();
         FinancingAuditingDto financingAuditingDto = new FinancingAuditingDto();
 
+        //此处是工作流网关路线原因 相同参数存在工作流不知道怎么执行报错问题 暂未排除问题 先修改不同表达式
         if (params.containsKey("isFlag")){
             financingAuditingDto.setStatus(params.get("isFlag").equals("0")?"已退回":"");
             task.setResultCode("isFlag");
@@ -224,6 +232,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto,Finan
         if (params.containsKey("isZG")) {
             financingAuditingDto.setStatus("已提交");
         }
+        financingAuditingDto.setNodeRouting(FinancingAuditEnum.getNodeByCode(workflowResultDto.getNextNodeKey()));
         financingAuditingService.createWithModel(financingAuditingDto);
 
         String nameByCode = FinancingAuditEnum.getNameByCode(workflowResultDto.getNextNodeKey());
@@ -232,7 +241,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto,Finan
         LambdaQueryWrapper<FinancingInfo> info = new LambdaQueryWrapper<>();
         info.eq(FinancingInfo::getPeasantHouseholdId,financingAuditing.getPeasantHouseholdId());
         FinancingInfo financingInfo = this.getBaseMapper().selectOne(info);
-
+        //标识对于整改待推送状态
         if (params.containsKey("isZG")){
             financingInfo.setStatus("整改待推送");
         }else {
@@ -240,6 +249,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto,Finan
         }
         this.updateById(financingInfo);
 
+        //节点为待整改时生成整改单
         if (params.containsKey("isFlag")&& params.get("isFlag").equals("0") && workflowResultDto.getNextNodeKey().equals(FinancingAuditEnum.待整改.getCode())){
 
           LambdaQueryWrapper<FinancingRectificationOrder> queryWrapper = new LambdaQueryWrapper<>();
@@ -249,12 +259,15 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto,Finan
           FinancingRectificationOrder oldData = financingRectificationOrderService.getBaseMapper().selectOne(queryWrapper);
 
           FinancingRectificationOrder financingRectificationOrder = new FinancingRectificationOrder();
+          //若存在历史整改单 将历史整改单数据同步至新整改单 便于修改
           if (ObjectUtils.isNotEmpty(oldData)){
               BeanUtils.copyProperties(oldData,financingRectificationOrder);
               financingRectificationOrder.setSequenceNbr(null);
+              financingRectificationOrder.setCompleteDate(null);
           }
           financingRectificationOrder.setRectificationOrderCode(String.valueOf(new Date().getTime()));
           financingRectificationOrder.setRectificationStatus("待整改");
+          financingRectificationOrder.setProblemDescription(params.getOrDefault("problemDescription","").toString());
           financingRectificationOrder.setPeasantHouseholdName(params.getOrDefault("peasantHouseholdName","").toString());
           financingRectificationOrder.setRectificationDescription(params.getOrDefault("rectificationDescription","").toString());
           financingRectificationOrder.setPeasantHouseholdId(financingInfo.getPeasantHouseholdId() );