Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

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

@@ -166,6 +166,9 @@ public class JgReformNoticeDto extends BaseDto {
     @ApiModelProperty(value = "设备类别名称")
     private String equCategoryName;
 
+    @ApiModelProperty(value = "工程装置名称")
+    private String projectContraption;
+
     /* ----------------  -------------- */
 
     @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/JgReformNotice.java

@@ -177,6 +177,12 @@ public class JgReformNotice extends BaseEntity {
     private String constructionManagerId;
 
     /**
+     * 工程装置名称
+     */
+    @TableField("project_contraption")
+    private String projectContraption;
+
+    /**
      * 施工负责人手机
      */
 	@TableField("construction_manager_phone")

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

@@ -306,7 +306,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             }
 
             JgMaintainNotice notice = jgMaintainNoticeMapper.selectById(noticeDto.getSequenceNbr());
-            this.checkRepeatUsed(submitType, notice);
             //  submitType=1为流程提交否则仅为保存业务数据
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();

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

@@ -425,14 +425,15 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             notice.setCreateUserName(reginParams.getUserModel().getRealName());
             notice.setCreateUserId(reginParams.getUserModel().getUserId());
             notice.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
+            notice.setProjectContraption(String.valueOf(jsonObject.get("projectContraption")));
             String equListCode = String.valueOf(jsonObject.get("EQU_LIST_CODE"));
             String equCategoryCode = String.valueOf(jsonObject.get("EQU_CATEGORY_CODE"));
             notice.setEquListCode(equListCode);
             EquipmentCategory equipmentCategory1 = equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode, equListCode));
-            notice.setEquListName(equipmentCategory1.getName());
+            notice.setEquListName(ValidationUtil.isEmpty(equipmentCategory1) ? null : equipmentCategory1.getName());
             notice.setEquCategoryCode(equCategoryCode);
             EquipmentCategory equipmentCategory2 = equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode, equCategoryCode));
-            notice.setEquCategoryName(equipmentCategory2.getName());
+            notice.setEquCategoryName(ValidationUtil.isEmpty(equipmentCategory2) ? null : equipmentCategory2.getName());
 
             // 统计用
             notice.setReceiveCompanyOrgCode(companyBo.getOrgCode());