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

@@ -178,7 +178,13 @@ public class JgReformNoticeDto extends BaseDto {
 
     @ApiModelProperty(value = "设备使用地点-街道（镇）")
     private String streetName;
+    //
+    // private String receiveOrgCreditCode;
+
+    @ApiModelProperty(value = "下一执行节点ids")
+    private String nextExecuteIds;
 
-    private String receiveOrgCreditCode;
+    @ApiModelProperty(value = "发起人id用于撤回操作")
+    private String promoter;
 
 }

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

@@ -22,7 +22,7 @@ public class JgScrapCancelDto  extends BaseDto {
 
 
     @ApiModelProperty(value = "注销类型（1报废注销，2移装注销）")
-    private String type;
+    private String cancelType;
 
     @ApiModelProperty(value = "申请编号")
     private String applyNo;

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

@@ -33,5 +33,10 @@ public class JgChangeRegistrationReformEq extends BaseEntity {
      */
 	@TableField("equ_id")
     private String equId;
+    /**
+     * 使用登记证编号是否作废（1作废，0在用）
+     */
+    @TableField("is_invalid")
+    private Boolean isInvalid =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/JgChangeRegistrationTransferEq.java

@@ -34,4 +34,11 @@ public class JgChangeRegistrationTransferEq extends BaseEntity {
 	@TableField("equ_id")
     private String equId;
 
+    /**
+     * 使用登记证编号是否作废（1作废，0在用）
+     */
+    @TableField("is_invalid")
+    private Boolean isInvalid =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

@@ -276,4 +276,14 @@ public class JgReformNotice extends BaseEntity {
 
     @TableField(value ="\"street_name\"")
     private String streetName;
+    /**
+     * 下一执行节点ids
+     */
+    @TableField("next_execute_ids")
+    private String nextExecuteIds;
+    /**
+     * 发起人id用于撤回操作
+     */
+    @TableField(value = "promoter")
+    private String promoter;
 }

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

@@ -25,8 +25,8 @@ public class JgScrapCancel extends BaseEntity {
     /**
      * 注销类型（1报废注销，2移装注销）
      */
-	@TableField("type")
-    private String type;
+	@TableField("cancel_type")
+    private String cancelType;
 
     /**
      * 申请编号

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

@@ -34,4 +34,10 @@ public class JgUseRegistrationEq extends BaseEntity {
 	@TableField("equ_id")
     private String equId;
 
+    /**
+     * 使用登记证编号是否作废（1作废，0在用）
+     */
+    @TableField("is_invalid")
+    private Boolean isInvalid =false;
+
 }

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

+package com.yeejoin.amos.boot.module.jg.api.enums;
+
+/**
+ * 办理状态枚举
+ */
+public enum CancelTypeEnum {
+
+    /**
+     * 报废注销
+     */
+    SCRAPPED("1", "报废注销"),
+    /**
+     * 移装注销
+     */
+    TRANSFER("2", "移装注销");
+
+    private final String code;
+
+    private final String name;
+
+    CancelTypeEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public static String getNameByType(String code) {
+        String name = null;
+        for (CancelTypeEnum enumOne : CancelTypeEnum.values()) {
+            if (enumOne.getCode() == code) {
+                name = enumOne.getName();
+                break;
+            }
+        }
+        return name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationReformEqMapper.java

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReformEq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * 改造变更登记设备关系表 Mapper 接口
@@ -10,5 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @date 2023-12-20
  */
 public interface JgChangeRegistrationReformEqMapper extends BaseMapper<JgChangeRegistrationReformEq> {
-
+    @Update("update jg_change_registration_reform set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id = #{currentDocumentId} ")
+    void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param("equipId") String equipId, @Param("currentDocumentId") String currentDocumentId);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationReformMapper.java

@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 import java.util.Map;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationTransferEqMapper.java

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransferEq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * 移装变更登记设备关系表 Mapper 接口
@@ -10,5 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @date 2023-12-20
  */
 public interface JgChangeRegistrationTransferEqMapper extends BaseMapper<JgChangeRegistrationTransferEq> {
-
+    @Update("update tzs_jg_change_registration_transfer_eq set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id = #{currentDocumentId} ")
+    void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param("equipId") String equipId,@Param("currentDocumentId") String currentDocumentId);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgReformNoticeMapper.java

@@ -33,4 +33,6 @@ public interface JgReformNoticeMapper extends CustomBaseMapper<JgReformNotice> {
      */
     @MapKey ("sequenceNbr")
     List<Map<String, Object>> queryEquipInformation(@Param("sequenceNbr") long sequenceNbr);
+
+    void updatePromoter(@Param("id") Long id);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationEqMapper.java

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * 使用登记设备关系表 Mapper 接口
@@ -10,5 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @date 2023-12-18
  */
 public interface JgUseRegistrationEqMapper extends BaseMapper<JgUseRegistrationEq> {
-
+    @Update("update tzs_jg_use_registration_eq set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id = #{currentDocumentId} ")
+    void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param("equipId") String equipId, @Param("currentDocumentId") String currentDocumentId);
 }

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

@@ -23,7 +23,9 @@
         isn.instance_id AS instanceId,
         isn.plan_date AS planDate,
         isn.receive_company_code AS receiveCompanyCode,
-        isn.receive_org_name AS receiveOrgName
+        isn.receive_org_name AS receiveOrgName,
+        isn.next_execute_ids as nextExecuteIds,
+        isn.promoter
         FROM
         tzs_jg_reform_notice isn
         <where>
@@ -76,6 +78,9 @@
         isn.receive_company_code AS receiveCompanyCode,
         isn.receive_org_name AS receiveOrgName,
         isn.receive_org_code AS receiveOrgCode,
+        isn.next_execute_ids as nextExecuteIds,
+        isn.promoter,
+        isn.notice_status AS noticeStatus,
         ri.equ_code AS equRegisterCode,
         ri.equ_list AS equList,
         ri.equ_category AS equCategory,
@@ -123,4 +128,9 @@
         isn.sequence_nbr = #{sequenceNbr}
         LIMIT 1
     </select>
+
+    <update id="updatePromoter">
+        UPDATE tzs_jg_reform_notice set promoter = null
+        where sequence_nbr = #{id}
+    </update>
 </mapper>

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

@@ -22,7 +22,7 @@
         ur.instance_id as instanceId,
         re.equ_id as equipId,
         ur.apply_no as applyNo,
-       ifnull(ur.next_execute_ids,'') as nextExecuteIds,
+       ur.next_execute_ids as nextExecuteIds,
         ur.promoter
         from tzs_jg_use_registration ur
         LEFT JOIN tzs_jg_use_registration_eq re  on ur.sequence_nbr = re.equip_transfer_id

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

@@ -10,11 +10,11 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
+import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.UseStatusEnum;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationReformEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationReformMapper;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationTransferEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationReformService;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
@@ -60,6 +60,17 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     private OtherInfoMapper otherInfoMapper;
     @Autowired
     private JgChangeRegistrationReformMapper jgChangeRegistrationReformMapper;
+    //改造登记关系表mapper
+    @Autowired
+    private JgChangeRegistrationReformEqMapper jgChangeRegistrationReformEqMapper;
+    //移装登记关系表
+    @Autowired
+    private JgChangeRegistrationTransferEqMapper jgChangeRegistrationTransferEqMapper;
+
+    //使用登记关系表mapper
+    @Autowired
+    private JgUseRegistrationEqMapper jgUseRegistrationEqMapper;
+
     @Autowired
     WorkFlowFeignService workFlowFeginService;
     @Autowired
@@ -112,16 +123,16 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         } else {
 
             // 业务管理设备信息保存
-            JgUseRegistrationEq jgRelationEquip = new JgUseRegistrationEq();
-            jgRelationEquip.setEquId(map.get("equipId").toString());
+            JgChangeRegistrationReformEq jgChangeRegistrationReformEq = new JgChangeRegistrationReformEq();
+            jgChangeRegistrationReformEq.setEquId(map.get("equipId").toString());
 //            jgRelationEquip.setBusinessType(String.valueOf(BusinessTypeEnum.USAGE_REGISTRATION.getCode()));
             List<String> applicationFormCode = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
             jgChangeRegistrationReform.setApplyNo(applicationFormCode.get(0));
             jgChangeRegistrationReform.setAuditStatus("待提交");
             jgChangeRegistrationReform.setStatus(UseStatusEnum.SUBMIT.getPass());
             this.save(jgChangeRegistrationReform);
-            jgRelationEquip.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr().toString());
-            jgChangeRegistrationReformMapper.insert(jgChangeRegistrationReform);
+            jgChangeRegistrationReformEq.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr().toString());
+            jgChangeRegistrationReformEqMapper.insert(jgChangeRegistrationReformEq);
         }
 
         if (!ObjectUtils.isEmpty(map.get("submit"))) {
@@ -212,8 +223,10 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         lambda.eq(JgChangeRegistrationReform::getSequenceNbr, id);
         JgChangeRegistrationReform jgChangeRegistrationReform = this.getBaseMapper().selectOne(lambda);
         if ("流程结束".equals(taskName)) {
+            JgChangeRegistrationReformEq jgChangeRegistrationReformEq = jgChangeRegistrationReformEqMapper.selectOne(new QueryWrapper<JgChangeRegistrationReformEq>().eq("equip_transfer_id",jgChangeRegistrationReform.getSequenceNbr()));
             jgChangeRegistrationReform.setStatus(taskName);
             jgChangeRegistrationReform.setAuditStatus("已完成");
+            makeEquipmentsInvalid(jgChangeRegistrationReformEq.getEquId(),jgChangeRegistrationReform.getSequenceNbr().toString());
         } else {
             jgChangeRegistrationReform.setNextExecuteIds(role);
             jgChangeRegistrationReform.setPromoter(reginParams.getUserModel().getUserId());
@@ -288,4 +301,16 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
         return detail;
     }
+
+
+    /**
+     *  批量设置设备无效(使用登记、移装登记、改造登记)
+     * @param equipmentId 装备id
+     * @param currentDocumentId 当前文档id
+     */
+    public void  makeEquipmentsInvalid(String equipmentId,String currentDocumentId){
+       jgChangeRegistrationReformEqMapper.updateEquipIsVaildByEquipIdAndCurrentDocumentId(equipmentId,currentDocumentId);
+       jgChangeRegistrationTransferEqMapper.updateEquipIsVaildByEquipIdAndCurrentDocumentId(equipmentId,currentDocumentId);
+       jgUseRegistrationEqMapper.updateEquipIsVaildByEquipIdAndCurrentDocumentId(equipmentId,currentDocumentId);
+    }
 }
\ No newline at end of file

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

@@ -7,6 +7,8 @@ import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.ByteArrayMultipartFile;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;
@@ -44,6 +46,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
@@ -106,7 +109,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     TzsServiceFeignClient tzsServiceFeignClient;
     @Autowired
     SupervisoryCodeInfoMapper supervisoryCodeInfoMapper;
-
+    @Autowired
+    private RedisUtils redisUtils;
 
     public static byte[] file2byte(File file) {
         try {
@@ -215,7 +219,13 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                     noticeDto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                     JgReformNotice bean = new JgReformNotice();
                     BeanUtils.copyProperties(noticeDto, bean);
+                    ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+                    bean.setPromoter(reginParams.getUserModel().getUserId());
                     JgReformNoticeMapper.updateById(bean);
+                    Boolean rollBack = "1".equals(op) ? true : false;
+                    if (rollBack) {
+                        JgReformNoticeMapper.updatePromoter(noticeDto.getSequenceNbr());
+                    }
                 }
             } catch (Exception e) {
                 log.error("提交失败：{}", e);
@@ -446,7 +456,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 e.printStackTrace();
             }
         }
-
+        // ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         List<JgReformNotice> list = new ArrayList<>();
         List<JgReformNoticeEq> equipList = new ArrayList<>();
         deviceList.forEach(obj -> {
@@ -467,6 +477,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             } else {
                 dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             }
+            dto.setPromoter(reginParams.getUserModel().getUserId());
             list.add(dto);
             equipList.add(jgRelationEquip);
         });
@@ -540,9 +551,6 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 model.setUseUnitName(useUnitList[1]);
             }
         }
-        if (org.apache.commons.lang3.StringUtils.isEmpty(model.getReceiveOrgCode())) {
-            model.setReceiveOrgCode(model.getReceiveOrgCreditCode());
-        }
         String receiveOrgId = model.getReceiveOrgCode();
         if (!ObjectUtils.isEmpty(receiveOrgId)) {
             String[] receiveOrgIdList = receiveOrgId.split("_");
@@ -602,8 +610,11 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         FeignClientResult ajaxResult = Workflow.taskV2Client.rollBack(noticeDto.getInstanceId());
         JgReformNotice JgReformNotice = this.baseMapper.selectById(noticeDto.getSequenceNbr());
         if (ajaxResult.getStatus() == 200) {
+            ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+            JgReformNotice.setPromoter(reginParams.getUserModel().getUserId());
             JgReformNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             JgReformNoticeMapper.updateById(JgReformNotice);
+            JgReformNoticeMapper.updatePromoter(JgReformNotice.getSequenceNbr());
         }
     }
 
@@ -623,9 +634,9 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         queryWrapper.eq(JgReformNoticeEq::getEquipTransferId, dto.getSequenceNbr());
         JgReformNoticeEq jgRelationEquip = JgReformNoticeEqMapper.selectOne(queryWrapper);
 
-        LambdaQueryWrapper<OtherInfo> queryWrapper1 = new LambdaQueryWrapper<>();
-        queryWrapper1.eq(OtherInfo::getRecord, jgRelationEquip.getEquId());
-        OtherInfo tzsJgOtherInfo = tzsJgOtherInfoMapper.selectOne(queryWrapper1);
+        // LambdaQueryWrapper<OtherInfo> queryWrapper1 = new LambdaQueryWrapper<>();
+        // queryWrapper1.eq(OtherInfo::getRecord, jgRelationEquip.getEquId());
+        // OtherInfo tzsJgOtherInfo = tzsJgOtherInfoMapper.selectOne(queryWrapper1);
 
         LambdaQueryWrapper<RegistrationInfo> queryWrapper2 = new LambdaQueryWrapper<>();
         queryWrapper2.eq(RegistrationInfo::getRecord, jgRelationEquip.getEquId());
@@ -633,7 +644,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
 
 
         stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(JgReformNotice.getCity()).append(ym);
-        String equCode = stringBuffer.toString();
+        // String equCode = stringBuffer.toString();
         // 只有安装设备需要
         // String deviceRegistrationCode = iCreateCodeService.createDeviceRegistrationCode(equCode);
         Map<String, Object> map = new HashMap<>();
@@ -669,7 +680,13 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 JgReformNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
                 // JgReformNotice.setStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
             }
+            ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+            JgReformNotice.setPromoter(reginParams.getUserModel().getUserId());
             JgReformNoticeMapper.updateById(JgReformNotice);
+            Boolean rollBack = "1".equals(op) ? true : false;
+            if (rollBack) {
+                JgReformNoticeMapper.updatePromoter(JgReformNotice.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/JgUseRegistrationServiceImpl.java

@@ -98,8 +98,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistration.setSupervisoryCode(supervisoryCode);
         jgUseRegistration.setUseUnitName(useInfo.getUseUnitName());
         jgUseRegistration.setUseUnitCreditCode(useInfo.getUseUnitCreditCode());
-        jgUseRegistration.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
-        jgUseRegistration.setInspectUnitName(map.get("inspectOrgName").toString());
+        jgUseRegistration.setUseUnitCreditCode("91610131628001738N");
+        if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))){
+            jgUseRegistration.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
+        }
+        if (!ObjectUtils.isEmpty(map.get("inspectOrgName"))){
+            jgUseRegistration.setInspectUnitName(map.get("inspectOrgName").toString());
+        }
 
 
         if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
@@ -129,7 +134,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 // 启动并执行流程
                 instanceId = startByVariable();
                 jgUseRegistration.setInstanceStatus("1460532889249755137");
-                jgUseRegistration.setUseUnitCreditCode("91610131628001738N");
                 jgUseRegistration.setReceiveCompanyCode("610000");
             }
 
@@ -283,7 +287,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         detail.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
         detail.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));
         detail.put("insUseMaintainExplanin", JSON.parse(String.valueOf(detail.get("insUseMaintainExplanin"))));
-        detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
+//        detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
         return detail;
     }
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcInspectionApplication.java

@@ -163,10 +163,17 @@ public class JyjcInspectionApplication extends BaseEntity {
      */
     @TableField("result_type")
     private String resultType;
-
     /**
-     * 工作流下一个可执行节点
+     * 下一执行节点ids
      */
     @TableField("next_execute_ids")
     private String nextExecuteIds;
+    /**
+     * 发起人id用于撤回操作
+     */
+    @TableField(value = "promoter")
+    private String promoter;
+
+    @TableField(value = "create_user_id")
+    private String createUserId;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcOpeningApplication.java

@@ -114,9 +114,16 @@ public class JyjcOpeningApplication extends BaseEntity {
     @TableField (value = "workflow_active_key")
     private String workflowActiveKey;
     /**
-     * 工作流下一个可执行节点
+     * 下一执行节点ids
      */
     @TableField("next_execute_ids")
     private String nextExecuteIds;
+    /**
+     * 发起人id用于撤回操作
+     */
+    @TableField(value = "promoter")
+    private String promoter;
 
+    @TableField(value = "create_user_id")
+    private String createUserId;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/FlowStatusEnum.java

@@ -8,7 +8,7 @@ public enum  FlowStatusEnum {
     /**
      * 待提交
      */
-    TO_BE_SUBMITTED(6610, "待提交"),
+    TO_BE_SUBMITTED(6610, "未提交"),
     /**
      * 已提交
      */
@@ -34,7 +34,11 @@ public enum  FlowStatusEnum {
     /**
      * 已完成
      */
-    TO_BE_FINISHED(6616, "已完成");
+    TO_BE_FINISHED(6616, "已完成"),
+    /**
+     * 已作废
+     */
+    TO_BE_DISCARD(6617, "已作废");
 
     private final int code;
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionApplicationMapper.java

@@ -23,4 +23,6 @@ public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspecti
    Page<JyjcInspectionApplicationEquipModel> listByCategory(Page<JyjcInspectionApplicationEquipModel> page,@Param("equipClassify")  String equipClassify);
 
    JyjcInspectionApplicationModel selectDataBySeq(Long sequenceNbr);
+
+   void updatePromoter(@org.apache.ibatis.annotations.Param ("id") Long id);
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcOpeningApplicationMapper.java

@@ -18,4 +18,5 @@ public interface JyjcOpeningApplicationMapper extends BaseMapper<JyjcOpeningAppl
     Page<JyjcOpeningApplicationModel> selectJyjcOpeningApplicationList(@Param("page")Page<JyjcOpeningApplication> page,
                                                                        @Param("jyjcOpeningApplicationRequstDto") JyjcOpeningApplicationRequstDto jyjcOpeningApplicationRequstDto, @Param("applyStartTime") String applyStartTime, @Param("applyendTime") String applyendTime);
 
+    void updatePromoter(@Param("id") Long id);
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionApplicationModel.java

 package com.yeejoin.amos.boot.module.jyjc.api.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -148,7 +149,12 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     @ApiModelProperty("检验结果方式")
     private String resultType;
 
-    @ApiModelProperty("工作流下一个可执行节点")
+    @ApiModelProperty(value = "下一执行节点ids")
     private String nextExecuteIds;
 
+    @ApiModelProperty(value = "发起人id用于撤回操作")
+    private String promoter;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String createUserId;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcOpeningApplicationModel.java

@@ -77,8 +77,14 @@ public class JyjcOpeningApplicationModel extends BaseModel {
     @ApiModelProperty (value = "工作流节点")
     private String workflowActiveKey;
 
-    @ApiModelProperty (value = "工作流下一个可执行节点")
+    @ApiModelProperty(value = "下一执行节点ids")
     private String nextExecuteIds;
+
+    @ApiModelProperty(value = "发起人id用于撤回操作")
+    private String promoter;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String createUserId;
     /* ----------------  -------------- */
     @ApiModelProperty (value = "企业资质信息")
     List<TzBaseUnitLicenceDto> baseUnitLicences;

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

@@ -24,7 +24,9 @@
         tbei.use_unit AS inspectionUnitName,
         tzjia.status,
         cdd2.NAME AS statusName,
-        tzjia.next_execute_ids as nextExecuteIds
+        tzjia.next_execute_ids as nextExecuteIds,
+        tzjia.promoter,
+        tzjia.create_user_id
         FROM
         tz_jyjc_inspection_application AS tzjia
         LEFT JOIN tz_base_enterprise_info tbei ON tbei.use_code = tzjia.application_unit_code
@@ -36,7 +38,7 @@
         LEFT JOIN cb_data_dictionary cdd3 ON cdd3.code = tzjia.inspection_type
         <where>
         <if test=" applicationNo != null and applicationNo != ''">
-            and application_no like concat('%',#{applicationNo}.'%')
+            and application_no like concat('%',#{applicationNo},'%')
         </if>
         <if test="inspectionClassify != null and inspectionClassify != ''">
             and inspection_classify = #{inspectionClassify}
@@ -63,7 +65,7 @@
             and accept_date = #{acceptDate}
         </if>
         <if test="inspectionChargePerson != null and inspectionChargePerson != ''">
-            and inspection_charge_person like concat('%',#{inspectionChargePerson}.'%')
+            and inspection_charge_person like concat('%',#{inspectionChargePerson},'%')
         </if>
         <if test="status != null and status != ''">
             and status = #{status}
@@ -124,4 +126,9 @@
         WHERE
             tzjia.sequence_nbr = #{sequenceNbr}
     </select>
+
+    <update id="updatePromoter">
+        UPDATE tz_jyjc_inspection_application set promoter = null
+        where sequence_nbr = #{id}
+    </update>
 </mapper>

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

@@ -25,7 +25,9 @@
         unit_code_name,
         status_name,
         workflow_active_key,
-        next_execute_ids
+        next_execute_ids,
+        promoter,
+        create_user_id
         from tz_jyjc_opening_application
         <where>
             <if test="jyjcOpeningApplicationRequstDto.applicationSeq != '' and jyjcOpeningApplicationRequstDto.applicationSeq != null">
@@ -50,4 +52,9 @@
         order by sequence_nbr desc
 
     </select>
+
+    <update id="updatePromoter">
+        UPDATE tz_jyjc_opening_application set promoter = null
+        where sequence_nbr = #{id}
+    </update>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcOpeningApplicationController.java

@@ -100,8 +100,8 @@ public class JyjcOpeningApplicationController extends BaseController {
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
     public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
 		JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationServiceImpl.getById(sequenceNbr);
-		List<String> status = Arrays.asList(String.valueOf(FlowStatusEnum.SUBMITTED.getCode()),String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
-		if(!status.contains(jyjcOpeningApplication.getStatus())){
+		List<String> status = Arrays.asList(String.valueOf(FlowStatusEnum.SUBMITTED.getCode()), String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()), String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
+		if(status.contains(jyjcOpeningApplication.getStatus())) {
 			throw new BadRequest("除撤回跟驳回的流程之外其余流程不可删除！");
 		}
         return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.removeById(sequenceNbr));

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

@@ -7,8 +7,12 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.enums.WorkFlowEnum;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.*;
@@ -36,6 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
@@ -85,9 +90,11 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
     @Autowired
     JgFeignClient jgFeignClient;
-
+    @Autowired
+    private RedisUtils redisUtils;
 
     public JyjcInspectionApplicationModel save(@RequestBody JSONObject obj) {
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 
         //开启报检流程工作流
 
@@ -108,6 +115,17 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                     model.setProcessInstanceId(id);
                     execueFlow(MapBuilder.<String, Object>create().put("op", "0").put("instanceId", id).put("comments", "").build());
 
+
+                    // region 获取下一个流程节点的数据
+                    Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(model.getProcessInstanceId());
+                    String role = (String) nextNodeInfo.get("role");
+                    model.setNextExecuteIds(role);
+                    if (!org.springframework.util.ObjectUtils.isEmpty(model.getWorkflowRole())) {
+                        model.setWorkflowRole(model.getWorkflowRole() + "," + role);
+                    } else {
+                        model.setWorkflowRole(role);
+                    }
+
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -128,15 +146,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
             model.setApplicationNo(codes.get(0));
             model.setApplicationDate(new Date());
-            // region 获取下一个流程节点的数据
-            Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(model.getProcessInstanceId());
-            String role = (String) nextNodeInfo.get("role");
-            model.setNextExecuteIds(role);
-            if (!org.springframework.util.ObjectUtils.isEmpty(model.getWorkflowRole())) {
-                model.setWorkflowRole(model.getWorkflowRole() + "," + role);
-            } else {
-                model.setWorkflowRole(role);
-            }
+
+            model.setPromoter(reginParams.getUserModel().getUserId());
 
             List<JyjcInspectionApplicationEquip>  equipInfos = new ArrayList<>();
             if (null != model.getEquip() && model.getEquip().size() > 0) {
@@ -151,9 +162,18 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                     equipInfos.add(equipInfo);
                 }
             }
+            model.setCreateUserId(reginParams.getUserModel().getUserId());
             model.setNumberOfEquip(equipInfos.size());
             // endregion
-            model = this.createWithModel(model);
+
+            if (null == model.getSequenceNbr()){
+                model = this.createWithModel(model);
+            }else {
+                model = this.updateWithModel(model);
+            }
+
+
+
             //保存报检装备监管码
             for (JyjcInspectionApplicationEquip equipInfo : equipInfos) {
                 equipInfo.setApplicationSeq(model.getSequenceNbr());
@@ -219,6 +239,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(model.getProcessInstanceId());
             String role = (String) nextNodeInfo.get("role");
             model.setNextExecuteIds(role);
+            model.setPromoter(reginParams.getUserModel().getUserId());
             if (!org.springframework.util.ObjectUtils.isEmpty(model.getWorkflowRole())) {
                 model.setWorkflowRole(model.getWorkflowRole() + "," + role);
             } else {
@@ -334,7 +355,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         Long sequenceNbr = Long.parseLong(params.get("sequenceNbr") + "");
         JyjcInspectionApplicationModel inspectionApplicationModel = this.queryBySeq(sequenceNbr);
         params.put("status", FlowStatusEnum.TO_BE_FINISHED.getCode() + "");
-        updateModelByInstanceId(inspectionApplicationModel.getProcessInstanceId(), params);
+        String op = params.get("op").toString();
+        Boolean rollBack = "1".equals(op) ? true : false;
+        updateModelByInstanceId(sequenceNbr, inspectionApplicationModel.getProcessInstanceId(), params, rollBack);
         List<JyjcInspectionApplicationEquipModel> applicationEquipModels = applicationEquipService.listApplicationEquipByApplicationSeq(sequenceNbr);
         if (inspectionApplicationModel == null || ValidationUtil.isEmpty(applicationEquipModels)) {
             log.warn("JyjcInspectionApplicationModel Not Found！");
@@ -377,9 +400,12 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
      */
     public Boolean doReject(Map<String, Object> params) {
         execueFlow(params);
+        String op = params.get("op").toString();
+        Long sequenceNbr = Long.parseLong(params.get("sequenceNbr") + "");
         String instanceId = Optional.ofNullable(params.get("instanceId")).orElse("").toString();
-        params.put("status", FlowStatusEnum.TO_BE_SUBMITTED.getCode() + "");
-        updateModelByInstanceId(instanceId, params);
+        params.put("status", FlowStatusEnum.REJECTED.getCode() + "");
+        Boolean rollBack = "1".equals(op) ? true : false;
+        updateModelByInstanceId(sequenceNbr, instanceId, params, rollBack);
         return true;
     }
 
@@ -431,7 +457,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 log.error("撤回工作流错误, => {}", jsonObject);
                 return false;
             }
-            updateModelByInstanceId(inspectionApplicationModel.getProcessInstanceId(), MapBuilder.<String, Object>create().put("status", FlowStatusEnum.TO_BE_SUBMITTED.getCode() + "").build());
+            updateModelByInstanceId(inspectionApplicationModel.getSequenceNbr(), inspectionApplicationModel.getProcessInstanceId(), MapBuilder.<String, Object>create().put("status", FlowStatusEnum.ROLLBACK.getCode() + "").build(), true);
             return true;
         } catch (Exception e) {
             e.printStackTrace();
@@ -440,8 +466,12 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         }
     }
 
-    public void updateModelByInstanceId(String instanceId, Map<String, Object> params) {
-        JyjcInspectionApplication entity = this.lambdaQuery().eq(JyjcInspectionApplication::getProcessInstanceId, instanceId).one();
+    public void updateModelByInstanceId(Long sequenceNbr, String instanceId, Map<String, Object> params, Boolean rollBack) {
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        LambdaQueryWrapper<JyjcInspectionApplication> lambda = new QueryWrapper<JyjcInspectionApplication>().lambda();
+        lambda.eq(JyjcInspectionApplication::getSequenceNbr, sequenceNbr);
+        JyjcInspectionApplication entity = this.getBaseMapper().selectOne(lambda);
+        // JyjcInspectionApplication entity = this.lambdaQuery().eq(JyjcInspectionApplication::getProcessInstanceId, instanceId).one();
         if (entity == null) {
             return;
         }
@@ -461,6 +491,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(instanceId);
         String role = (String) nextNodeInfo.get("role");
         entity.setNextExecuteIds(role);
+        entity.setPromoter(reginParams.getUserModel().getUserId());
         if (!org.springframework.util.ObjectUtils.isEmpty(entity.getWorkflowRole())) {
             entity.setWorkflowRole(entity.getWorkflowRole() + "," + role);
         } else {
@@ -469,5 +500,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         entity.setStatus(status);
         entity.setAcceptDate(new Date());
         this.updateById(entity);
+        if (rollBack) {
+            this.getBaseMapper().updatePromoter(entity.getSequenceNbr());
+        }
     }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java

@@ -26,6 +26,7 @@ public enum ApplicationFormTypeEnum {
     DWBG("DWBG"),//单位变更登记
     JY("JY"),
     JG("JG"),// 检验结果
+    SBZX("SBZX"),//电梯（设备）注销
     ;
 
     /**