使用单位变更

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","noticeDate","installStartDate","handleDate");
+    private List<String> customFields = Arrays.asList("acceptDate", "expiryDate","applicationDate","noticeDate","installStartDate","handleDate","auditPassDate","applyDate");
 
     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/JgChangeRegistrationUnitDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -31,6 +33,7 @@ public class JgChangeRegistrationUnitDto  extends BaseDto {
     private String applyNo;
 
     @ApiModelProperty(value = "申请日期")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date applyDate;
 
     @ApiModelProperty(value = "办理状态")
@@ -46,6 +49,7 @@ public class JgChangeRegistrationUnitDto  extends BaseDto {
     private String receiveCompanyCode;
 
     @ApiModelProperty(value = "终审通过时间")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date auditPassDate;
 
     @ApiModelProperty(value = "备注")

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

@@ -2,7 +2,9 @@ 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.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;
@@ -38,6 +40,7 @@ public class JgChangeRegistrationUnit extends BaseEntity {
      * 申请日期
      */
 	@TableField("apply_date")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date applyDate;
 
     /**
@@ -68,6 +71,7 @@ public class JgChangeRegistrationUnit extends BaseEntity {
      * 终审通过时间
      */
 	@TableField("audit_pass_date")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date auditPassDate;
 
     /**

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

@@ -59,7 +59,7 @@ public enum WorkFlowStatusEnum {
     /**
      * 使用单位更登记流程
      */
-    UNITCHANGE_SUBMIT("使用单位提交", "unitChangeSubmit", "使用单位待提交", "一级受理已驳回", "使用单位提交已撤回"),
+    UNITCHANGE_SUBMIT("使用单位提交", "unitChangeSubmit", "使用单位待提交", "一级受理已驳回", "使用单位已撤回"),
     UNITCHANGE_RECEIVE("一级受理", "unitChangeReceive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
     UNITCHANGE_PRELIMINARY("二级受理", "unitChangePreliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
     UNITCHANGE_REEXAMINE("三级受理", "unitChangeReexamine", "三级待受理","","");

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

@@ -10,11 +10,16 @@
         isn.use_unit_name AS useUnitName,
         isn.receive_org_name AS receiveOrgName,
         isn.new_use_unit_name AS newUseUnitName,
+        isn.equ_address AS equAddress,
+        isn.product_name_b AS productNameB,
+        isn.equ_code_b AS equCodeB,
+        isn.use_inner_code AS useInnerCode,
+        isn.use_regist_code AS useRegistCode,
         isn.apply_date AS applyDate,
         isn.status AS status,
         isn.instance_id AS instanceId,
         isn.promoter,
-        isn.next_execute_ids AS nextExecuteIds,
+        isn.next_executor_ids AS nextExecutorIds,
         isn.instance_status AS instanceStatus,
         isn.audit_pass_date AS auditPassDate,
         isn.equ_type AS equType
@@ -27,17 +32,20 @@
                     AND isn.apply_no LIKE CONCAT('%', #{param.applyNo}, '%')
                 </if>
                 <if test="param.receiveOrgCode != null and param.receiveOrgCode != ''">
-                    AND isn.receive_org_credit_code = #{param.receiveOrgCreditCode}
+                    AND isn.receive_org_code = #{param.receiveOrgCode}
                 </if>
                 <if test="param.useUnitName != null and param.useUnitName != ''">
-                    AND isn.use_unit_credit_code = #{param.useUnitName}
+                    AND isn.use_unit_code = #{param.useUnitName}
                 </if>
                 <if test="param.status != null and param.status != ''">
                     AND isn.status = #{param.status}
                 </if>
+                <if test="param.equCodeB != null and param.equCodeB != ''">
+                    AND isn.equ_code_b = #{param.equCodeB}
+                </if>
             </if>
             <if test="type == 'supervision'">
-                AND isn.receive_org_credit_code = #{orgCode}
+                AND isn.receive_org_code = #{orgCode}
                 AND isn.instance_id  is not null
             </if>
             <if test="type == 'enterprise'">
@@ -50,22 +58,16 @@
             </if>
         </where>
         ORDER BY
-        isn.create_date DESC
+        isn.create_date,isn.apply_no DESC
     </select>
 
     <select id="queryEquipInformation" resultType="java.util.Map">
         select
             isn.sequence_nbr AS sequenceNbr,
             isn.apply_no AS applyNo,
-            isn.use_unit_name AS useUnitName,
-            isn.use_unit_credit_code AS useUnitName,
-            isn.new_use_unit_credit_code AS useUnitName,
-            isn.new_use_unit_name AS useUnitName,
-            isn.receive_org_name AS receiveOrgName,
-            isn.receive_org_code AS receiveOrgCode,
             isn.change_certificate AS changeCertificate,
             isn.remark AS remark,
-            isn.equ_register_code AS equRegisterCode,
+            isn.use_regist_code AS equRegisterCode,
             ri.equ_list AS equList,
             ri.equ_category AS equCategory,
             ri.EQU_DEFINE AS equDefine,
@@ -99,7 +101,7 @@
             ei.address AS address
         FROM
             tzs_jg_change_registration_unit isn
-                LEFT JOIN tzs_jg_change_registration_unit_eq re ON re.equip_transfer_id = isn.sequence_nbr
+                LEFT JOIN tzs_jg_change_registration_unit_eq re ON re.unit_change_registration_id = isn.sequence_nbr
                 LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
                 LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
                 LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id

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

@@ -70,15 +70,13 @@ public class JgChangeRegistrationUnitController extends BaseController {
 	@PutMapping(value = "/update")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新单位变更", notes = "根据sequenceNbr更新单位变更")
 	public ResponseModel<JgChangeRegistrationUnitDto> updateBySequenceNbrJgInstallationNotice(@RequestParam String submitType, @RequestBody Map<String, Object> model, @RequestParam(value = "op", required = false) String op) {
-		JgChangeRegistrationUnitDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("changeRegisInfo")), JgChangeRegistrationUnitDto.class, true);
-		if (Objects.isNull(installationInfo)) {
+		JgChangeRegistrationUnitDto jgChangeRegistrationUnitDto = BeanUtil.mapToBean(((LinkedHashMap) model.get("changeRegisInfo")), JgChangeRegistrationUnitDto.class, true);
+		if (Objects.isNull(jgChangeRegistrationUnitDto)) {
 			throw new IllegalArgumentException("参数installationInfo不能为空");
 		}
-//		Object o = ((LinkedHashMap<?, ?>) model.get("installationInfo")).get("proxyStatementAttachment");
-//		Object o1 = ((LinkedHashMap<?, ?>) model.get("installationInfo")).get("installContractAttachment");
-//		installationInfo.setProxyStatementAttachmentList((List<Map<String, Object>>) o);
-//		installationInfo.setInstallContractAttachmentList((List<Map<String, Object>>) o1);
-		return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.updateInstallationNotice(submitType,installationInfo, op));
+		Object o = ((LinkedHashMap<?, ?>) model.get("changeRegisInfo")).get("changeCertificateList");
+		jgChangeRegistrationUnitDto.setChangeCertificateList((List<Map<String, Object>>) o);
+		return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.updateInstallationNotice(submitType,jgChangeRegistrationUnitDto, op));
 	}
 
 	/**
@@ -163,7 +161,7 @@ public class JgChangeRegistrationUnitController extends BaseController {
 	@PostMapping(value = "/cancel")
 	@ApiOperation(httpMethod = "POST", value = "单位变更撤销", notes = "单位变更撤销")
 	public ResponseModel<JgChangeRegistrationUnitDto> cancel(@RequestBody Map<String, Object> model) {
-		JgChangeRegistrationUnitDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("installationInfo")), JgChangeRegistrationUnitDto.class, true);
+		JgChangeRegistrationUnitDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("changeRegisInfo")), JgChangeRegistrationUnitDto.class, true);
 		if (Objects.isNull(installationInfo)) {
 			throw new IllegalArgumentException("参数installationInfo不能为空");
 		}
@@ -181,9 +179,9 @@ public class JgChangeRegistrationUnitController extends BaseController {
 	@ApiOperation(httpMethod = "POST", value = "单位变更受理", notes = "单位变更受理")
 	public ResponseModel<JgChangeRegistrationUnitDto> accept(@RequestBody Map<String, Object> model, String op) {
 		// TODO 受理单位变更流程
-		LinkedHashMap model1 = (LinkedHashMap)model.get("model");
+		LinkedHashMap model1 = (LinkedHashMap)model.get("changeRegisInfo");
 		String opinion = (String)model.get("opinion");
-		LinkedHashMap installationInfo = (LinkedHashMap)model1.get("installationInfo");
+		LinkedHashMap installationInfo = (LinkedHashMap)model1.get("changeRegisInfo");
 		JgChangeRegistrationUnitDto jgInstallationNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgChangeRegistrationUnitDto.class);
 		jgInstallationNoticeDto.setProcessAdvice(opinion);
 		jgChangeRegistrationUnitServiceImpl.accept(jgInstallationNoticeDto,op);