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

@@ -79,6 +79,8 @@ public class JgReformNoticeDto extends BaseDto {
     private String instanceStatus;
 
     @ApiModelProperty (value = "受理完成日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date acceptDate;
 
     @ApiModelProperty (value = "施工区域-省")
@@ -153,6 +155,12 @@ public class JgReformNoticeDto extends BaseDto {
 
     @ApiModelProperty (value = "是否西咸")
     private String isXixian;
+
+    @ApiModelProperty(value = "设备类别")
+    private String equListCode;
+
+    @ApiModelProperty(value = "设备类别名称")
+    private String equCategory;
     /* ----------------  -------------- */
 
     @TableField (exist = false)

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

@@ -298,4 +298,15 @@ public class JgReformNotice extends BaseEntity {
      */
     @TableField("status")
     private String status;
+    /**
+     * 设备类别
+     */
+    @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/resources/mapper/JgReformNoticeMapper.xml

@@ -27,7 +27,10 @@
         isn.next_execute_ids as nextExecuteIds,
         isn.promoter,
         isn.notice_report_url,
-        isn.accept_date
+        isn.accept_date,
+        isn.equ_list_code,
+        isn.equ_category,
+        isn.create_user_id
         FROM
         tzs_jg_reform_notice isn
         <where>
@@ -39,6 +42,9 @@
                 <if test="param.receiveOrgName != null and param.receiveOrgName != ''">
                     AND isn.receive_org_name LIKE CONCAT('%', #{param.receiveOrgName}, '%')
                 </if>
+                <if test="param.receiveOrgCode != null and param.receiveOrgCode != ''">
+                    AND isn.receive_org_code = #{param.receiveOrgCode}
+                </if>
                 <if test="param.useUnitName != null and param.useUnitName != ''">
                     AND isn.use_unit_name LIKE CONCAT('%', #{param.useUnitName}, '%')
                 </if>
@@ -117,7 +123,6 @@
         fi.factory_standard AS factoryStandard,
         fi.product_quality_yield_prove AS productQualityYieldProve,
         fi.ins_use_maintain_explain AS insUseMaintainExplain,
-        ui.safety_manager AS safetyManager,
         ei.legal_person AS safetyManager,
         ei.legal_phone AS safetyManagerPhone,
         ei.ADDRESS AS useUnitAddress

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

@@ -21,6 +21,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -138,10 +139,13 @@ public class CommonController extends BaseController {
 	@ApiOperation (httpMethod = "GET", value = "流程状态枚举列表", notes = "流程状态枚举列表")
 	@GetMapping (value = "/flow-status/list")
 	public ResponseModel<List<Map<String, Object>>> selectForFlowStatusList() {
-		return ResponseHelper.buildResponse(Arrays.stream(FlowStatusEnum.values()).map(this::mapPointTypeToMap).collect(Collectors.toList()));
+		return ResponseHelper.buildResponse(Arrays.stream(FlowStatusEnum.values()).map(this::mapPointTypeToMap).filter(Objects::nonNull).collect(Collectors.toList()));
 	}
 
 	private Map<String, Object> mapPointTypeToMap(FlowStatusEnum e) {
+		if (FlowStatusEnum.TO_SUBMITTED.getCode() ==  e.getCode()) {
+			return null;
+		}
 		Map<String, Object> record = new HashMap<>();
 		record.put("key", e.getCode());
 		record.put("label", e.getName());

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

@@ -492,6 +492,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             String applyNo = applyNoList.get(i);
             dto.setApplyNo(applyNo);
             dto.setNoticeDate(new Date());
+            dto.setEquCategory(String.valueOf(obj.get("EQU_CATEGORY")));
+            dto.setEquListCode(String.valueOf(obj.get("EQU_LIST_CODE")));
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 dto.setNextExecuteIds(String.join(",", roleListSecond));
                 dto.setInstanceStatus(String.join(",", roleListFirst));
@@ -508,6 +510,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             } else {
                 dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             }
+            dto.setCreateUserId(reginParams.getUserModel().getUserId());
             list.add(dto);
             equipList.add(jgRelationEquip);
         });
@@ -727,7 +730,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                     // SupervisoryCodeInfo supervisoryCodeInfo = supervisoryCodeInfoMapper.selectOne(queryWrapper3);
                     // supervisoryCodeInfo.setStatus("1");
                     // supervisoryCodeInfoMapper.updateById(supervisoryCodeInfo);
-
+                    jgReformNotice.setAcceptDate(new Date());
                     jgReformNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
                     this.generateInstallationNoticeReport(jgReformNotice.getSequenceNbr());
                     // 更新其他业务表