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/dto/JgTransferNoticeDto.java

@@ -2,7 +2,9 @@ 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.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -31,6 +33,7 @@ public class JgTransferNoticeDto extends BaseDto {
     private String applyNo;
 
     @ApiModelProperty(value = "告知日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date noticeDate;
 
     @ApiModelProperty(value = "告知状态")
@@ -58,6 +61,8 @@ public class JgTransferNoticeDto extends BaseDto {
     private String executeSequence;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date createDate;
 
     @ApiModelProperty(value = "创建人id ")
@@ -73,6 +78,8 @@ public class JgTransferNoticeDto extends BaseDto {
     private String instanceStatus;
 
     @ApiModelProperty(value = "受理完成日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date acceptDate;
 
     @ApiModelProperty(value = "施工区域-省")
@@ -183,6 +190,7 @@ public class JgTransferNoticeDto extends BaseDto {
         return (StringUtils.isEmpty(this.provinceName) ? "" : this.provinceName)
                 + (StringUtils.isEmpty(this.cityName) ? "" : this.cityName)
                 + (StringUtils.isEmpty(this.countyName) ? "" : this.countyName)
+                + (StringUtils.isEmpty(this.street) ? "" : this.street)
                 + (StringUtils.isEmpty(this.address) ? "" : this.address);
     }
 
@@ -198,6 +206,8 @@ public class JgTransferNoticeDto extends BaseDto {
     private String equipCateName;
 
     @ApiModelProperty(value = "办理日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date handleDate;
 
     private String noticeReportUrl;

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

@@ -15,7 +15,7 @@
         ur.status,
         ur.receive_org_name as receiveOrgName,
         DATE_FORMAT(ur.reg_date,'%Y-%m-%d') as regDate,
-        DATE_FORMAT(ur.rec_date,'%Y-%m-%d') as recDate,
+        DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
         (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY) as equCategory,
         jri.PRODUCT_NAME as productName,
         jri.EQU_CODE as equCode,

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

@@ -62,7 +62,7 @@
             </if>
         </where>
         ORDER BY
-        tjtn.notice_date DESC
+        tjtn.apply_no DESC
     </select>
 
     <select id="queryEquipInformation" resultType="java.util.Map">
@@ -90,10 +90,10 @@
             tjtn.city_name AS cityName,
             tjtn.county_name AS countyName,
             tjtn.promoter AS promoter,
-            tjtn.equ_register_code AS equRegisterCode,
             tjtn.plan_date AS installStartDate,
             tjtn.construction_manager AS installLeaderName,
             tjtn.construction_manager_phone AS installLeaderPhone,
+            ri.equ_code AS equRegisterCode,
             ri.equ_list AS equList,
             ri.equ_category AS equCategory,
             ri.EQU_DEFINE AS equDefine,

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/JgChangeRegistrationReformServiceImpl.java

@@ -274,6 +274,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             }
 
         } else {
+            jgChangeRegistrationReform.setAuditPassDate(new Date());
             jgChangeRegistrationReform.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
             jgChangeRegistrationReform.setStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
             JgChangeRegistrationReformEq jgChangeRegistrationReformEq = jgChangeRegistrationReformEqMapper.selectOne(new QueryWrapper<JgChangeRegistrationReformEq>().eq("equip_transfer_id", jgChangeRegistrationReform.getSequenceNbr()));

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/JgTransferNoticeServiceImpl.java

@@ -119,7 +119,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             return null;
         }
         Map<String, Object> transferNotice = BeanUtil.beanToMap(notice);
-
         transferNotice.put("province", notice.getProvince() + "_" + notice.getProvinceName());
         transferNotice.put("city", notice.getCity() + "_" + notice.getCityName());
         transferNotice.put("county", notice.getCounty() + "_" + notice.getCountyName());
@@ -128,11 +127,12 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         if(!ValidationUtil.isEmpty(notice.getFactoryUseSiteStreet()) && !ValidationUtil.isEmpty(notice.getStreetName())) {
             transferNotice.put("factoryUseSiteStreet", notice.getFactoryUseSiteStreet() + "_" + notice.getStreetName());
         }
-
+        if(!ValidationUtil.isEmpty(notice.getConstructionManagerId()) && !ValidationUtil.isEmpty(notice.getConstructionManager())) {
+            transferNotice.put("constructionManagerId", notice.getConstructionManagerId() + "_" + notice.getConstructionManager());
+        }
         String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
                 "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
                 "proxyStatementAttachment", "installContractAttachment", "powerOfAttorney", "constructionContract"};
-
         // 设备信息
         List<Map<String, Object>> equipmentInfos = jgTransferNoticeMapper.queryEquipInformation(sequenceNbr);
 
@@ -201,7 +201,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         placeholders.put("productName", getValue.apply("productName"));
         placeholders.put("equipType", getValue.apply("equType"));
         placeholders.put("equipCode", getValue.apply("equRegisterCode"));
-        placeholders.put("produceCode", getValue.apply("produceCode")); // TODO: 制造编号
+        placeholders.put("produceCode", getValue.apply("factoryNum")); // TODO: 制造编号 - 设备出厂编号
         placeholders.put("produceUnitName", getValue.apply("produceUnitName"));
         placeholders.put("produceLicenseNum", getValue.apply("produceLicenseNum"));
         placeholders.put("fullAddress", getValue.apply("provinceName") + getValue.apply("cityName") + getValue.apply("countyName") + getValue.apply("address"));

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionResultMapper.xml

@@ -7,7 +7,7 @@
         select res.sequence_nbr, res.inspection_unit_code, res.application_no, res.application_unit_code,
         res.equip_unicode, res.result_status, res.license_number, res.result_no, res.inspector, res.inner_person_code,
         res.inspection_conclusion, res.inspection_date, res.next_inspection_date, res.inspection_start_date,
-        res.inspection_end_date, res.inspection_result_summary, res.non_conformance, res.rectification, res.remark,
+        res.inspection_end_date, res.inspection_result_summary, res.non_conformance, res.remark,
         res.rec_user_id, res.rec_date, res.biz_type,res.equ_category, res.inspection_type, res.inspection_type_name,
         res.application_date,use_unit_name, use_unit_credit_code, province_name, city_name, county_name, street_name, equ_code, use_inner_code, ibjri.equ_list,
          tec1.name equ_list_name, ibjri.equ_category , ibjoi.SUPERVISORY_CODE supervisoryCode