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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/common/BizCustomDateSerializer.java

@@ -30,7 +30,7 @@ import java.util.Objects;
  */
 public class BizCustomDateSerializer extends JsonSerializer<Date> {
 
-    private List<String> customFields = Arrays.asList("acceptDate", "expiryDate","applicationDate");
+    private List<String> customFields = Arrays.asList("acceptDate", "expiryDate","applicationDate","noticeDate","installStartDate","handleDate");
 
     public BizCustomDateSerializer()
     {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgInstallationNoticeDto.java

@@ -2,8 +2,10 @@ package com.yeejoin.amos.boot.module.jg.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -86,6 +88,7 @@ public class JgInstallationNoticeDto extends BaseDto {
 
     @ApiModelProperty(value = "安装开始日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date installStartDate;
 
     @ApiModelProperty(value = "安装竣工日期")
@@ -183,6 +186,7 @@ public class JgInstallationNoticeDto extends BaseDto {
     private String isXixian;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     @ApiModelProperty(value = "告知日期")
     private Date noticeDate;
 
@@ -240,6 +244,7 @@ public class JgInstallationNoticeDto extends BaseDto {
     private String equAddress;
 
     @ApiModelProperty(value = "办理日期")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date handleDate;
 
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgInstallationNotice.java

@@ -2,7 +2,10 @@ package com.yeejoin.amos.boot.module.jg.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -153,6 +156,8 @@ public class JgInstallationNotice extends BaseEntity {
      * 安装开始日期
      */
     @TableField("install_start_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date installStartDate;
 
     /**
@@ -333,6 +338,8 @@ public class JgInstallationNotice extends BaseEntity {
      * 告知日期
      */
     @TableField("notice_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date noticeDate;
 
     /**
@@ -384,6 +391,7 @@ public class JgInstallationNotice extends BaseEntity {
     private String equAddress;
 
     @TableField("handle_date")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date handleDate;
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEquipTransferMapper.xml

@@ -86,6 +86,7 @@
             </if>
             <if test="type == 'installUnit'">
                 AND jet.install_unit_credit_code = #{companyCode}
+                AND jet.instance_id  is not null
             </if>
         </where>
         ORDER BY jet.apply_date DESC

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml

@@ -4,30 +4,30 @@
 
     <select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice">
         select
-            isn.sequence_nbr AS sequenceNbr,
-            isn.apply_no AS applyNo,
-            isn.supervisory_code AS supervisoryCode,
-            isn.notice_date AS noticeDate,
-            isn.use_unit_name AS useUnitName,
-            isn.receive_org_name AS receiveOrgName,
-            isn.region_no AS regionNo,
-            isn.install_start_date AS installStartDate,
-            isn.address AS address,
-            isn.notice_status AS noticeStatus,
-            isn.install_unit_name AS installUnitName,
-            isn.province_name AS provinceName,
-            isn.city_name AS cityName,
-            isn.county_name AS countyName,
-            isn.instance_id AS instanceId,
-            isn.promoter,
-            isn.next_execute_ids AS nextExecuteIds,
-            isn.instance_status AS instanceStatus,
-            isn.equ_address AS equAddress,
-            isn.handle_date AS handleDate,
-            isn.equ_list AS equList,
-            isn.notice_report_url AS noticeReportUrl
+        isn.sequence_nbr AS sequenceNbr,
+        isn.apply_no AS applyNo,
+        isn.supervisory_code AS supervisoryCode,
+        isn.notice_date AS noticeDate,
+        isn.use_unit_name AS useUnitName,
+        isn.receive_org_name AS receiveOrgName,
+        isn.region_no AS regionNo,
+        isn.install_start_date AS installStartDate,
+        isn.address AS address,
+        isn.notice_status AS noticeStatus,
+        isn.install_unit_name AS installUnitName,
+        isn.province_name AS provinceName,
+        isn.city_name AS cityName,
+        isn.county_name AS countyName,
+        isn.instance_id AS instanceId,
+        isn.promoter,
+        isn.next_execute_ids AS nextExecuteIds,
+        isn.instance_status AS instanceStatus,
+        isn.equ_address AS equAddress,
+        isn.handle_date AS handleDate,
+        isn.equ_list AS equList,
+        isn.notice_report_url AS noticeReportUrl
         FROM
-            tzs_jg_installation_notice isn
+        tzs_jg_installation_notice isn
         <where>
             isn.is_delete = false
             <if test="param != null ">
@@ -118,6 +118,6 @@
                 LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = isn.use_unit_credit_code
         WHERE
             isn.sequence_nbr = #{sequenceNbr}
-        LIMIT 1
+            LIMIT 1
     </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgScrapCancelMapper.xml

@@ -35,7 +35,7 @@
         jri.EQU_CODE as equCode,
         use.USE_INNER_CODE as innerCode,
         use.ADDRESS as address,
-        concat(use.PROVINCE_NAME,'-',use.CITY_NAME,'-',use.COUNTY_NAME) as place,
+        CONCAT(use.PROVINCE_NAME,'', use.CITY_NAME, '', use.COUNTY_NAME, '', use.street_name, use.ADDRESS, '') AS place,
         re.equ_id as equipId
         from tzs_jg_scrap_cancel ur
         LEFT JOIN tzs_jg_scrap_cancel_eq re  on ur.sequence_nbr = re.equip_transfer_id

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgEquipTransferServiceImpl.java

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -154,10 +153,14 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
             String applyNo = applyNoList.get(i);
             dto.setApplyNo(applyNo);
             dto.setApplyDate(new Date());
-            dto.setNextExecuteIds(String.join(",", roleListSecond));
-            dto.setInstanceStatus(String.join(",", roleListFirst));
-            dto.setPromoter(reginParams.getUserModel().getUserId());
-            dto.setApplyStatus(taskName[0]);
+
+            if(SUBMIT_TYPE_FLOW.equals(submitType)) {
+                dto.setNextExecuteIds(String.join(",", roleListSecond));
+                dto.setInstanceStatus(String.join(",", roleListFirst));
+                dto.setPromoter(reginParams.getUserModel().getUserId());
+                dto.setApplyStatus(taskName[0]);
+            }
+
             jgEquipTransferEq.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
             jgEquipTransferEq.setEquipTransferId(applyNo);
             if (!CollectionUtils.isEmpty(instanceIdList)) {
@@ -194,27 +197,6 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
         }
     }
 
-    public Map<String, Object> getNextWorkflowNode(String instanceId) {
-        String role = "";
-        String taskName = "流程结束";
-        ArrayList<String> roleList = new ArrayList<>();
-        AjaxResult taskNoAuth = Workflow.taskClient.getTaskNoAuth(instanceId);
-        if (!org.springframework.util.ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
-            JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
-            String nextTaskId = nextTask.getString("id");
-            taskName = nextTask.getString("name");
-            AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
-            JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
-            for (Object datum : data) {
-                if (((Map) datum).containsKey("groupId")) {
-                    roleList.add(((Map) datum).get("groupId").toString());
-                }
-            }
-        }
-        role = String.join(",", roleList);
-        return MapBuilder.<String, Object>create().put("taskName", taskName).put("role", role).build();
-    }
-
     void getNext(ArrayList<String> roleListFirst, String instanceId, String[] taskName) {
         AjaxResult aj = Workflow.taskClient.getTaskNoAuth(instanceId);
         JSONObject taskNoAuth = JSON.parseObject(JSON.toJSONString(aj.get("data")));
@@ -281,7 +263,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
             return null;
         }
 
-        Map<String, Object> equipTransferInfo = createEquipTransferInfo(equipTransfer);
+        Map<String, Object> equipTransferInfo = new HashMap<>();
 
         String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
                 "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
@@ -293,8 +275,9 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
         handleJsonArrayFields(equipmentInfos.get(0), fields);
 
         Map<String, Object> resultMap = new HashMap<>();
-        resultMap.putAll(equipmentInfos.get(0));
         resultMap.putAll(equipTransferInfo);
+        resultMap.putAll(equipmentInfos.get(0));
+        resultMap.putAll(createEquipTransferInfo(equipTransfer));
         return  resultMap;
     }
 
@@ -387,6 +370,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
         JgEquipTransfer equipTransfer = this.baseMapper.selectById(equipTransferInfo.getSequenceNbr());
         if (ajaxResult.getStatus() == 200) {
             equipTransfer.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+            equipTransfer.setPromoter("");
             this.baseMapper.updateById(equipTransfer);
         }
     }