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

@@ -236,4 +236,11 @@ public class JgInstallationNoticeDto extends BaseDto {
 
     private String instanceStatus;
 
+    @ApiModelProperty(value = "设备地址")
+    private String equAddress;
+
+    @ApiModelProperty(value = "办理日期")
+    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/dto/JgMaintainNoticeDto.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 JgMaintainNoticeDto extends BaseDto {
 
     @ApiModelProperty(value = "告知日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date noticeDate;
 
     @ApiModelProperty(value = "告知状态")
@@ -58,6 +61,8 @@ public class JgMaintainNoticeDto extends BaseDto {
     private String executeSequence;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date createDate;
 
     @ApiModelProperty(value = "创建人id ")
@@ -74,6 +79,7 @@ public class JgMaintainNoticeDto extends BaseDto {
 
     @ApiModelProperty(value = "受理完成日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date acceptDate;
 
     @ApiModelProperty(value = "施工区域-省")
@@ -93,6 +99,7 @@ public class JgMaintainNoticeDto extends BaseDto {
 
     @ApiModelProperty(value = "计划施工日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date planDate;
 
     @ApiModelProperty(value = "接收机构单位代码")
@@ -183,4 +190,10 @@ public class JgMaintainNoticeDto extends BaseDto {
 
     @ApiModelProperty(value = "节点执行人")
     private String promoter;
+
+    @ApiModelProperty(value = "设备类别")
+    private String equListCode;
+
+    @ApiModelProperty(value = "设备类别名称")
+    private String equCategory;
 }

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -74,6 +75,9 @@ public class JgScrapCancelDto extends BaseDto {
     @ApiModelProperty(value = "告知设备列表")
     private List<Map<String, Object>> deviceList;
 
+    @ApiModelProperty(value = "设备ID")
+    private String SEQUENCE_NBR;
+
 
     @ApiModelProperty(value = "终审通过时间")
     private Date auditPassDate;
@@ -85,4 +89,15 @@ public class JgScrapCancelDto extends BaseDto {
     // 区分监管和企业
     private String type;
 
+    /**
+     * 使用单位编码
+     */
+    private String useUnitCode;
+
+
+    /**
+     * 使用单位名称
+     */
+    private String useUnitName;
+
 }

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

@@ -194,4 +194,9 @@ public class JgTransferNoticeDto extends BaseDto {
 
     private String status;
 
+    @ApiModelProperty(value = "完整地址")
+    private String equipCateName;
+
+    @ApiModelProperty(value = "办理日期")
+    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

@@ -378,4 +378,12 @@ public class JgInstallationNotice extends BaseEntity {
 
     @TableField("instance_status")
     private String instanceStatus;
+
+
+    @TableField("equ_address")
+    private String equAddress;
+
+    @TableField("handle_date")
+    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/JgMaintainNotice.java

@@ -293,4 +293,15 @@ public class JgMaintainNotice extends BaseEntity {
     @TableField(value = "promoter")
     private String promoter;
 
+    /**
+     * 设备类别
+     */
+    @TableField(value = "equ_list_code")
+    private String equListCode;
+
+    /**
+     * 设备类别名称
+     */
+    @TableField(value = "equ_category")
+    private String equCategory;
 }

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

@@ -116,4 +116,18 @@ public class JgScrapCancel extends BaseEntity {
     @TableField(value = "promoter")
     private String promoter;
 
+    /**
+     * 使用单位编码
+     */
+    @TableField("use_unit_code")
+    private String useUnitCode;
+
+
+    /**
+     * 使用单位名称
+     */
+    @TableField(value = "use_unit_name")
+    private String useUnitName;
+
+
 }

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

@@ -290,4 +290,7 @@ public class JgTransferNotice extends BaseEntity {
     @TableField(value = "promoter")
     private String promoter;
 
+    @TableField(exist = false)
+    private String equipCateName;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/CancelTypeEnum.java

@@ -26,7 +26,7 @@ public enum CancelTypeEnum {
     public static String getNameByType(String code) {
         String name = null;
         for (CancelTypeEnum enumOne : CancelTypeEnum.values()) {
-            if (enumOne.getCode() == code) {
+            if (enumOne.getCode().equals(code)) {
                 name = enumOne.getName();
                 break;
             }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/CancelFlowStatusEnum.java → amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/CancelWorkFlowStatusEnum.java

@@ -8,12 +8,14 @@ import lombok.Getter;
  */
 @Getter
 @AllArgsConstructor
-public enum CancelFlowStatusEnum {
+public enum CancelWorkFlowStatusEnum {
+
+    SUBMIT("使用单位提交", "submit", "使用单位待提交", "一级单位已驳回", "使用单位撤回"),
+    RECEIVE("一级受理", "receive", "一级单位待受理", "二级单位已驳回", "一级单位撤回"),
+    PRELIMINARY("二级受理", "preliminary", "二级单位待受理", "三级单位已驳回", "二级单位撤回"),
+    REEXAMINE("三级受理", "reexamine", "三级单位待受理", "", ""),
+    COMPLETE("已完成", "complete", "已完成", "", "");
 
-    SUBMIT("使用单位提交", "submit", "使用单位待提交"),
-    RECEIVE("一级受理", "receive", "一级待受理"),
-    PRELIMINARY("二级受理", "preliminary", "二级待受理"),
-    REEXAMINE("三级受理", "reexamine", "三级待受理");
 
 
 
@@ -23,14 +25,27 @@ public enum CancelFlowStatusEnum {
 
     private final String pass;
 
+    private final String reject;
+
+    private final String rollBack;
+
 
 
-    public static CancelFlowStatusEnum getMessage(String name){
-        for (CancelFlowStatusEnum constants : values()) {
+    public static CancelWorkFlowStatusEnum getMessage(String name){
+        for (CancelWorkFlowStatusEnum constants : values()) {
             if (constants.getName().equals(name)) {
                 return constants;
             }
         }
         return null;
     }
+
+    public static CancelWorkFlowStatusEnum getMessageByCode(String code){
+        for (CancelWorkFlowStatusEnum constants : values()) {
+            if (constants.getCode().equals(code)) {
+                return constants;
+            }
+        }
+        return null;
+    }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/MaintainTypeEnum.java

-package com.yeejoin.amos.boot.module.jg.api.enums;
-
-/**
- * 办理状态枚举
- */
-public enum MaintainTypeEnum {
-    GENERAL(1, "一般维修"),
-    PRIORITY(2, "重点维修");
-
-    private final int code;
-
-    private final String name;
-
-    MaintainTypeEnum(int code, String name) {
-        this.code = code;
-        this.name = name;
-    }
-
-    public static String getNameByType(Long code) {
-        String name = null;
-        for (MaintainTypeEnum enumOne : MaintainTypeEnum.values()) {
-            if (enumOne.getCode() == code) {
-                name = enumOne.getName();
-                break;
-            }
-        }
-        return name;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public String getName() {
-        return name;
-    }
-}

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

@@ -11,6 +11,7 @@
             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,
@@ -21,6 +22,9 @@
             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
@@ -30,14 +34,14 @@
                 <if test="param.applyNo != null and param.applyNo != ''">
                     AND isn.apply_no LIKE CONCAT('%', #{param.applyNo}, '%')
                 </if>
-                <if test="param.receiveOrgName != null and param.receiveOrgName != ''">
-                    AND isn.receive_org_name LIKE CONCAT('%', #{param.receiveOrgName}, '%')
+                <if test="param.receiveOrgCreditCode != null and param.receiveOrgCreditCode != ''">
+                    AND isn.receive_org_credit_code = #{param.receiveOrgCreditCode}
                 </if>
                 <if test="param.useUnitName != null and param.useUnitName != ''">
-                    AND isn.use_unit_name LIKE CONCAT('%', #{param.useUnitName}, '%')
+                    AND isn.use_unit_credit_code = #{param.useUnitName}
                 </if>
                 <if test="param.installUnitName != null and param.installUnitName != ''">
-                    AND isn.install_unit_name LIKE CONCAT('%', #{param.installUnitName}, '%')
+                    AND isn.install_unit_credit_code = #{param.installUnitName}
                 </if>
                 <if test="param.noticeStatus != null and param.noticeStatus != ''">
                     AND isn.notice_status = #{param.noticeStatus}
@@ -51,7 +55,7 @@
             </if>
         </where>
         ORDER BY
-        isn.rec_date DESC
+        isn.create_date DESC
     </select>
 
     <select id="queryEquipInformation" resultType="java.util.Map">
@@ -62,6 +66,7 @@
             isn.province_name AS provinceName,
             isn.city_name AS cityName,
             isn.county_name AS countyName,
+            isn.street_name AS streetName,
             isn.address AS address,
             isn.install_start_date AS installStartDate,
             isn.install_license_no AS installLicenseNo,
@@ -98,12 +103,9 @@
             fi.factory_standard AS factoryStandard,
             fi.product_quality_yield_prove AS productQualityYieldProve,
             fi.ins_use_maintain_explain AS insUseMaintainExplain,
-            ui.safety_manager AS safetyManager,
-            ui.phone AS safetyManagerPhone,
-            ui.PROVINCE_NAME AS useUnitProvinceName,
-            ui.CITY_NAME AS useUnitCityName,
-            ui.COUNTY_NAME AS useUnitCountyName,
-            ui.ADDRESS AS useUnitAddress
+            ei.legal_person AS safetyManager,
+            ei.legal_phone AS safetyManagerPhone,
+            ei.address AS address
         FROM
             tzs_jg_installation_notice isn
                 LEFT JOIN tzs_jg_installation_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
@@ -112,6 +114,7 @@
                 LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
                 LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
                 LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
+                LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = isn.use_unit_credit_code
         WHERE
             isn.sequence_nbr = #{sequenceNbr}
         LIMIT 1

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

@@ -29,6 +29,8 @@
         tjmn.city_name AS cityName,
         tjmn.county_name AS countyName,
         tjmn.promoter,
+        tjmn.equ_category AS equCategory,
+        tjmn.equ_list_code AS equListCode,
         tjmn.instance_id AS instanceId
         FROM
         tzs_jg_maintain_notice tjmn
@@ -55,7 +57,7 @@
                 </if>
             </if>
             <if test="type == 'supervision'">
-                AND (tjmn.notice_status in ('6612', '6613', '6614') )
+                AND (tjmn.notice_status in ('6612', '6614', '6616') )
                 AND tjmn.receive_org_code = #{orgCode}
             </if>
             <if test="type == 'enterprise'">
@@ -63,7 +65,7 @@
             </if>
         </where>
         ORDER BY
-        tjmn.notice_date DESC
+        tjmn.create_date DESC
     </select>
 
     <select id="queryEquipInformation" resultType="java.util.Map">
@@ -90,12 +92,15 @@
             tjmn.county_name AS countyName,
             tjmn.instance_id AS instanceId,
             tjmn.promoter,
+            tjmn.equ_category AS equCategory,
+            tjmn.equ_list_code AS equListCode,
             ri.equ_list AS equList,
             ri.equ_category AS equCategory,
             ri.EQU_DEFINE AS equDefine,
             ri.product_name AS productName,
             ri.brand_name AS brandName,
             ri.equ_type AS equType,
+            ri.equ_code AS equRegisterCode,
             ri.equ_price AS equPrice,
             ri.product_photo AS productPhoto,
             di.design_unit_credit_code AS designUnitCreditCode,

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

@@ -26,7 +26,8 @@
         isn.receive_org_name AS receiveOrgName,
         isn.next_execute_ids as nextExecuteIds,
         isn.promoter,
-        isn.notice_report_url
+        isn.notice_report_url,
+        isn.accept_date
         FROM
         tzs_jg_reform_notice isn
         <where>
@@ -49,16 +50,15 @@
                 </if>
             </if>
             <if test="type == 'supervision'">
-                AND isn.notice_status in ('6612', '6613', '6614')
+                AND (isn.notice_status in ('6612', '6613', '6614', '6616')  )
                 AND isn.receive_org_code = #{orgCode}
-                <!--                AND (isn.notice_status in ('6612', '6613', '6614') or isn.status in('6614') )-->
             </if>
             <if test="type == 'enterprise'">
                 AND isn.install_unit_credit_code = #{orgCode}
             </if>
         </where>
         ORDER BY
-        isn.notice_date DESC
+        isn.rec_date DESC
     </select>
 
     <select id="queryEquipInformation" resultType="java.util.Map">
@@ -82,10 +82,16 @@
         isn.next_execute_ids as nextExecuteIds,
         isn.promoter,
         isn.notice_status AS noticeStatus,
+<!--        isn.install_start_date AS installLicenseExpirationDate,-->
+<!--        isn.install_license_no AS installLicenseNo,-->
+        isn.plan_date AS installStartDate,
+        isn.construction_manager AS installLeaderName,
+        isn.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,
+        fi.FACTORY_NUM AS produceCode,
         ri.product_name AS productName,
         ri.brand_name AS brandName,
         ri.equ_type AS equType,
@@ -112,11 +118,9 @@
         fi.product_quality_yield_prove AS productQualityYieldProve,
         fi.ins_use_maintain_explain AS insUseMaintainExplain,
         ui.safety_manager AS safetyManager,
-        ui.phone AS safetyManagerPhone,
-        ui.PROVINCE_NAME AS useUnitProvinceName,
-        ui.CITY_NAME AS useUnitCityName,
-        ui.COUNTY_NAME AS useUnitCountyName,
-        ui.ADDRESS AS useUnitAddress
+        ei.legal_person AS safetyManager,
+        ei.legal_phone AS safetyManagerPhone,
+        ei.ADDRESS AS useUnitAddress
         FROM
         tzs_jg_reform_notice isn
         LEFT JOIN tzs_jg_reform_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
@@ -125,6 +129,7 @@
         LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
         LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
         LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
+        LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = isn.use_unit_credit_code
         WHERE
         isn.sequence_nbr = #{sequenceNbr}
         LIMIT 1

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

@@ -12,7 +12,8 @@
         select ur.sequence_nbr as sequenceNbr,
         ur.instance_id as instanceId,
         ur.audit_status as auditStatus,
-        ur.rec_date as regDate,
+        ur.rec_date as recDate,
+        ur.create_date as createDate,
         ur.receive_org_code as receiveOrgCode,
         ur.receive_org_name as receiveOrgName,
         ur.receive_company_code as receiveCompanyCode,
@@ -26,12 +27,14 @@
         ifnull(ur.next_execute_ids,'') as nextExecuteIds,
         audit_pass_date as auditPassDate,
         use.USE_UNIT_CREDIT_CODE as useUnitCreditCode,
-        use.USE_UNIT_NAME as useUnitName,
+        ur.use_unit_name as useUnitName,
+        ur.use_unit_code as useUnitCode,
         (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY) as equCategory,
         jri.EQU_DEFINE as equDefine,
         jri.PRODUCT_NAME as productName,
         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,
         re.equ_id as equipId
         from tzs_jg_scrap_cancel ur

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

@@ -21,9 +21,13 @@
         tjtn.promoter AS promoter,
         tjtn.next_execute_ids AS nextExecuteIds,
         tjtn.instance_status AS instanceStatus,
-        tjtn.notice_report_url AS noticeReportUrl
+        tjtn.notice_report_url AS noticeReportUrl,
+        ec."name" AS equipCateName
         FROM
             tzs_jg_transfer_notice tjtn
+            LEFT JOIN tzs_jg_transfer_notice_eq re ON re.equip_transfer_id = tjtn.sequence_nbr
+            LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
+            LEFT JOIN tz_equipment_category ec ON ec.code = ri.equ_category
         <where>
             tjtn.is_delete = false
             <if test="param != null ">
@@ -50,7 +54,7 @@
                 </if>
             </if>
             <if test="type == 'supervision'">
-                AND tjtn.notice_status in ('6612', '6613', '6610')
+                AND tjtn.receive_org_code = #{orgCode}
             </if>
             <if test="type == 'enterprise'">
                 AND tjtn.install_unit_credit_code = #{orgCode}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +21,6 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -103,7 +100,15 @@ public class CommonController extends BaseController {
 	public ResponseModel<Map<String,Object>> getUserInfo(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
 		return ResponseHelper.buildResponse(commonService.getUserInfo(sequenceNbr));
 	}
-
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getUserInfoSplit")
+    @ApiOperation(httpMethod = "GET", value = "查询安全管理员的基本信息", notes = "查询安全管理员的基本信息")
+    public ResponseModel<Map<String, Object>> getUserInfoSplit(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
+        if (sequenceNbr.contains("_")) {
+            sequenceNbr = sequenceNbr.split("_")[0];
+        }
+        return ResponseHelper.buildResponse(commonService.getUserInfo(sequenceNbr));
+    }
 	/**
 	 * 查询企业的基本信息
 	 *

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgInstallationByWorkFlowController.java

@@ -80,8 +80,10 @@ public class JgInstallationByWorkFlowController {
     public ResponseModel<JgInstallationNoticeDto> accept(@RequestBody Map<String, Object> model, String op) {
         // TODO 受理安装告知流程
         LinkedHashMap model1 = (LinkedHashMap)model.get("model");
+        String opinion = (String)model.get("opinion");
         LinkedHashMap installationInfo = (LinkedHashMap)model1.get("installationInfo");
         JgInstallationNoticeDto jgInstallationNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgInstallationNoticeDto.class);
+        jgInstallationNoticeDto.setProcessAdvice(opinion);
         jgInstallationNoticeServiceImpl.accept(jgInstallationNoticeDto,op);
         return ResponseHelper.buildResponse(null);
     }

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

@@ -37,6 +37,8 @@ import com.yeejoin.amos.feign.workflow.model.AjaxResult;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.support.TransactionSynchronization;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.ObjectUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
@@ -319,21 +321,21 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         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"));
+        placeholders.put("installUnitAddress", getValue.apply("provinceName") + getValue.apply("cityName") + getValue.apply("countyName") + getValue.apply("streetName") + getValue.apply("address"));
         placeholders.put("installStartDate", getValue.apply("installStartDate"));
-        placeholders.put("installType", getValue.apply("installType")); // TODO: 施工类别
+        placeholders.put("installType", "安装告知"); // TODO: 施工类别
         placeholders.put("installLicenseNo", getValue.apply("installLicenseNo"));
         placeholders.put("installLicenseExpirationDate", getValue.apply("installLicenseExpirationDate"));
         placeholders.put("installLeaderName", getValue.apply("installLeaderName"));
         placeholders.put("installLeaderPhone", getValue.apply("installLeaderPhone"));
-        placeholders.put("installUnitAddress", getValue.apply("installUnitAddress")); // TODO: 施工单位地址
+        placeholders.put("fullAddress", getValue.apply("provinceName") + getValue.apply("cityName") + getValue.apply("countyName") + getValue.apply("streetName") + getValue.apply("address"));
         placeholders.put("useUnitName", getValue.apply("useUnitName"));
         placeholders.put("useUnitLeaderName", getValue.apply("safetyManager"));
         placeholders.put("useUnitLeaderPhone", getValue.apply("safetyManagerPhone"));
-        placeholders.put("useUnitLeaderAddress", getValue.apply("useUnitProvinceName") + getValue.apply("useUnitCityName") + getValue.apply("useUnitCountyName") + getValue.apply("useUnitAddress"));
+        placeholders.put("useUnitLeaderAddress", getValue.apply("address"));
         // 生成二维码
         String qrCode = ImageUtils.generateQRCode(getValue.apply("applyNo"), 300, 300);
         placeholders.put("qrCode", qrCode);
@@ -458,7 +460,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     TaskResultDTO dto = new TaskResultDTO();
                     dto.setResultCode("approvalStatus");
                     dto.setTaskId(taskId);
-                    dto.setComment("提交流程");
+                    dto.setComment("");
                     HashMap<String, Object> map = new HashMap<>();
                     map.put("approvalStatus", "0");
                     dto.setVariable(map);
@@ -498,6 +500,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             }
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
+            dto.setEquList((String.valueOf(obj.get("EQU_CATEGORY"))));
+            StringBuffer buffer = new StringBuffer();
+            buffer.append(dto.getProvinceName()).append(dto.getCityName()).append(dto.getCountyName()).append(dto.getAddress());
+            dto.setEquAddress(buffer.toString());
             jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
             jgRelationEquip.setEquipTransferId(applyNo);
             if (!CollectionUtils.isEmpty(instanceIdList)) {
@@ -630,7 +636,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         TaskResultDTO dto = new TaskResultDTO();
         dto.setResultCode("approvalStatus");
         dto.setTaskId(taskId);
-        dto.setComment("提交流程");
+        if(!ValidationUtil.isEmpty(notice.getProcessAdvice())) {
+            dto.setComment(notice.getProcessAdvice());
+        }
         HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", op);
         dto.setVariable(map);
@@ -664,10 +672,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         }
     }
 
+    @Transactional
     public void accept(JgInstallationNoticeDto dto,String op) {
         String[] taskName = new String[]{"流程结束"};
         String userId = RequestContext.getExeUserId();
         JgInstallationNotice jgInstallationNotice = this.jgInstallationNoticeMapper.selectById(dto.getSequenceNbr());
+        jgInstallationNotice.setProcessAdvice(dto.getProcessAdvice());
         // 组装设备注册代码
         StringBuffer stringBuffer = new StringBuffer();
         String ym = null;
@@ -706,7 +716,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     map.put("cityCode",jgInstallationNotice.getCity());
                     map.put("countyCode",jgInstallationNotice.getCounty());
                     map.put("equCategory",tzsJgRegistrationInfo.getEquCategory());
-                    map.put("isXiXian", jgInstallationNotice.getIsXixian() == null ? "0" : jgInstallationNotice.getIsXixian());
+                    map.put("isXiXian", jgInstallationNotice.getIsXixian() == null ? "null" : jgInstallationNotice.getIsXixian().equals("0") ? "null" : "1");
                     Map<String, Object> mapCode;
                     ResponseModel<Map<String, Object>> code = tzsServiceFeignClient.createCode(map);
                     mapCode = code.getResult();
@@ -716,18 +726,21 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     SupervisoryCodeInfo supervisoryCodeInfo = supervisoryCodeInfoMapper.selectOne(queryWrapper3);
                     supervisoryCodeInfo.setStatus("1");
                     supervisoryCodeInfoMapper.updateById(supervisoryCodeInfo);
-
                     jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
-                    this.generateInstallationNoticeReport(jgInstallationNotice.getSequenceNbr());
+                    jgInstallationNotice.setHandleDate(new Date());
+
+                    Map<String,Object> map1 =new HashMap<>();
+
                     // 更新其他业务表
-                    tzsJgOtherInfo.setCode96333(mapCode.get("code96333").toString());
+                    if(!ValidationUtil.isEmpty(mapCode.get("code96333"))) {
+                        tzsJgOtherInfo.setCode96333(mapCode.get("code96333").toString());
+                        map1.put("CODE96333",tzsJgOtherInfo.getCode96333() );
+                    }
                     tzsJgOtherInfo.setSupervisoryCode(mapCode.get("superviseCode").toString());
                     tzsJgRegistrationInfo.setEquCode(deviceRegistrationCode);
                     jgInstallationNotice.setEquRegisterCode(deviceRegistrationCode);
                     jgInstallationNotice.setSupervisoryCode(mapCode.get("superviseCode").toString());
                     Map<String,Map<String,Object>> objMap = new HashMap<>();
-                    Map<String,Object> map1 =new HashMap<>();
-                    map1.put("CODE96333",tzsJgOtherInfo.getCode96333() );
                     map1.put("EQU_CODE",tzsJgRegistrationInfo.getEquCode() );
                     map1.put("SUPERVISORY_CODE",tzsJgOtherInfo.getSupervisoryCode());
                     objMap.put(tzsJgOtherInfo.getRecord(),map1);
@@ -735,6 +748,13 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
                     tzsJgOtherInfoMapper.updateById(tzsJgOtherInfo);
                     tzsJgRegistrationInfoMapper.updateById(tzsJgRegistrationInfo);
+
+                    TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+                        @Override
+                        public void afterCommit() {
+                            generateInstallationNoticeReport(jgInstallationNotice.getSequenceNbr());
+                        }
+                    });
                 } else {
                     jgInstallationNotice.setNextExecuteIds(String.join(",", roleList));
                     if (!ObjectUtils.isEmpty(jgInstallationNotice.getInstanceStatus())) {

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

@@ -94,6 +94,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     SupervisoryCodeInfoMapper supervisoryCodeInfoMapper;
 
     @Autowired
+    IDataDictionaryService dataDictionaryService;
+
+    @Autowired
     RedisUtils redisUtils;
 
     public static byte[] file2byte(File file) {
@@ -127,6 +130,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         maintainInfo.put("constructionContractList", JSON.parseArray(notice.getConstructionContract()));
         maintainInfo.put("province", notice.getProvince() + "_" + notice.getProvinceName());
         maintainInfo.put("city", notice.getCity() + "_" + notice.getCityName());
+        maintainInfo.put("constructionManagerId", notice.getConstructionManagerId() + "_" + notice.getConstructionManager());
         maintainInfo.put("county", notice.getCounty() + "_" + notice.getCountyName());
         maintainInfo.put("fullAddress", notice.getProvinceName() + notice.getCityName() + notice.getCityName() + notice.getStreetName() + notice.getAddress());
         maintainInfo.put("useUnitCreditCode", notice.getUseUnitCreditCode() + "_" + notice.getUseUnitName());
@@ -218,8 +222,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     }
 
 
-    @Autowired
-    IDataDictionaryService dataDictionaryService;
     /**
      * 分页查询
      *
@@ -424,6 +426,8 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             int i = deviceList.indexOf(obj);
             String applyNo = applyNoList.get(i);
             dto.setApplyNo(applyNo);
+            dto.setEquCategory(String.valueOf(obj.get("EQU_CATEGORY")));
+            dto.setEquListCode(String.valueOf(obj.get("EQU_LIST_CODE")));
             dto.setNoticeDate(new Date());
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
@@ -475,6 +479,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 model.setCityName(cityList[1]);
             }
         }
+
         String county = model.getCounty();
         if (!ObjectUtils.isEmpty(county)) {
             String[] countyList = county.split("_");
@@ -509,6 +514,16 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 model.setReceiveOrgName(receiveOrgIdList[1]);
             }
         }
+
+        String constructionManager = model.getConstructionManagerId();
+        if (!ObjectUtils.isEmpty(constructionManager)) {
+            String[] constructionManagerList = constructionManager.split("_");
+            if (constructionManagerList.length > 1) {
+                model.setConstructionManagerId(constructionManagerList[0]);
+                model.setConstructionManager(constructionManagerList[1]);
+            }
+        }
+
         String inspectUnitId = model.getInspectionUnitCreditCode();
         if (!ObjectUtils.isEmpty(inspectUnitId)) {
             String[] inspectUnitIdList = inspectUnitId.split("_");
@@ -558,7 +573,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         FeignClientResult ajaxResult = Workflow.taskV2Client.rollBack(noticeDto.getInstanceId());
         JgMaintainNotice jgMaintainNotice = this.baseMapper.selectById(noticeDto.getSequenceNbr());
         if (ajaxResult.getStatus() == 200) {
-            jgMaintainNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+            jgMaintainNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
             jgMaintainNoticeMapper.updateById(jgMaintainNotice);
         }
     }
@@ -607,6 +622,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             if ("0".equals(op)) {
                 jgMaintainNotice.setPromoter(reginParams.getUserModel().getUserId());
                 jgMaintainNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
+                jgMaintainNotice.setAcceptDate(new Date());
                 this.generateMaintainNoticeReport(jgMaintainNotice.getSequenceNbr());
 //                // 更新其他业务表
 //                tzsJgOtherInfo.setCode96333(mapCode.get("code96333").toString());
@@ -617,7 +633,8 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
 //                tzsJgOtherInfoMapper.updateById(tzsJgOtherInfo);
 //                tzsJgRegistrationInfoMapper.updateById(tzsJgRegistrationInfo);
             } else {
-                jgMaintainNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+                //驳回
+                jgMaintainNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
                 jgMaintainNotice.setInstanceStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
                 jgMaintainNoticeMapper.updatePromoter(jgMaintainNotice.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

@@ -296,7 +296,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             // 发起流程
             if (!StringUtils.hasText(noticeDto.getInstanceId())) {
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-                dto.setProcessDefinitionKey("transferNotification");
+                dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
                 dto.setBusinessKey("1");
                 try {
                     ajaxResult = Workflow.taskClient.startByVariable(dto);
@@ -343,7 +343,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     public Page<JgTransferNoticeDto> queryForJgTransferNoticePage(Page<JgTransferNotice> page, JgTransferNoticeDto model, String type, ReginParams reginParams)   {
         String orgCode;
         orgCode = reginParams.getCompany().getCompanyCode();
-
+        model.setReceiveOrgCode(orgCode);
         Page<JgTransferNotice> noticePage = jgTransferNoticeMapper.queryForPage(page, model, type, orgCode);
 
         // 将Page<JgTransferNotice>转化为Page<JgTransferNoticeDto>
@@ -463,10 +463,12 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             dto.setPromoter(reginParams.getUserModel().getUserId());
             dto.setApplyNo(applyNo);
             dto.setNoticeDate(new Date());
-            dto.setNextExecuteIds(String.join(",", roleListSecond));
-            dto.setInstanceStatus(String.join(",", roleListFirst));
-            dto.setPromoter(reginParams.getUserModel().getUserId());
-            dto.setStatus(taskName[0]);
+            if(SUBMIT_TYPE_FLOW.equals(submitType)) {
+                dto.setNextExecuteIds(String.join(",", roleListSecond));
+                dto.setInstanceStatus(String.join(",", roleListFirst));
+                dto.setPromoter(reginParams.getUserModel().getUserId());
+                dto.setStatus(taskName[0]);
+            }
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
             jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/feign/TzsServiceFeignClient.java

+package com.yeejoin.amos.boot.module.jyjc.biz.feign;
+
+
+import com.yeejoin.amos.boot.biz.common.feign.FeignConfiguration;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.Map;
+
+@FeignClient(name = "TZS-YMT", path = "/ymt", configuration =
+        {FeignConfiguration.class})
+public interface TzsServiceFeignClient {
+
+
+    /**
+     * 创建监管码及96333
+     *
+     * @param map 请求体
+     * @return
+     */
+    @RequestMapping(value = "/equipment-category/createSupervisorCode", method = RequestMethod.POST)
+    ResponseModel<Map<String, Object>> createCode(@RequestBody Map<String, Object> map);
+
+    /**
+     * 创建监管码及96333
+     *
+     * @param paramMap 请求体
+     * @return
+     */
+    @RequestMapping(value = "/equipment-category/commonUpdateEsData", method = RequestMethod.POST)
+    ResponseModel<Map<String, Object>> commonUpdateEsDataByIds(@RequestBody Map<String, Map<String, Object>> paramMap);
+
+
+    /**
+     * 申请单编号生成
+     * @param type 参考ApplicationFormTypeEnum中的枚举
+     * @param batchSize batchSize
+     * @return List
+     */
+    @RequestMapping(value = "/generate-code/applicationFormCode", method = RequestMethod.POST)
+    ResponseModel<Map<String, Object>> applicationFormCode(@RequestParam("type") String type,
+                                                     @RequestParam("batchSize") int batchSize);
+
+    /**
+     * 生成设备注册编码
+     * @param key 16位
+     * @return 生成设备注册编码(20位)
+     */
+    @RequestMapping(value = "/generate-code/deviceRegistrationCode", method = RequestMethod.POST)
+    ResponseModel<String> deviceRegistrationCode(@RequestParam("key") String key);
+
+    /**
+     * 使用登记证生成
+     * @param key 起11陕C
+     * @return 生成使用登记证编号(13位，起11陕C00001(23))
+     */
+    @RequestMapping(value = "/generate-code/useRegistrationCode", method = RequestMethod.POST)
+    ResponseModel<String> useRegistrationCode(@RequestParam("key") String key);
+
+
+}

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

@@ -19,6 +19,7 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationRequstD
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcOpeningApplicationService;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
 import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
+import com.yeejoin.amos.boot.module.jyjc.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jyjc.biz.feign.WorkflowFeignClient;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseUnitLicenceDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
@@ -48,6 +49,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -69,6 +71,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     @Autowired
     private ICreateCodeService createCodeService;
     @Autowired
+    private TzsServiceFeignClient tzsServiceFeignClient;
+    @Autowired
     JyjcOpeningApplicationMapper jyjcOpeningApplicationMapper;
 
     @Resource(type = JyjcBaseMapper.class)
@@ -141,6 +145,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 CompanyBo companyBo = commonserviceImpl.getReginParamsOfCurrentUser().getCompany();
                 model.setUnitCode(companyBo.getCompanyCode());
                 model.setUnitCodeName(companyBo.getCompanyName());
+                ResponseModel<Map<String, Object>> result = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1);
                 List<String> codes = createCodeService.createApplicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1);
                 model.setApplicationSeq(codes.get(0));
                 model.setCreateUserId(reginParams.getUserModel().getUserId());