更新

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

 package com.yeejoin.amos.boot.module.jg.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
@@ -169,5 +170,9 @@ public class JgUseRegistration extends BaseEntity {
     private String nextExecuteIds;
 
 
+    @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/enums/UseStatusEnum.java

@@ -14,9 +14,9 @@ import java.util.Map;
 public enum UseStatusEnum {
 
     SUBMIT("使用单位提交", "submit", "使用单位待提交"),
-    RECEIVE("一级受理", "receive", "一级受理待受理"),
-    PRELIMINARY("二级受理", "preliminary", "二级受理待受理"),
-    REEXAMINE("三级受理", "reexamine", "三级受理待受理");
+    RECEIVE("一级受理", "receive", "一级待受理"),
+    PRELIMINARY("二级受理", "preliminary", "二级待受理"),
+    REEXAMINE("三级受理", "reexamine", "三级待受理");
 
 
 

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

@@ -27,4 +27,5 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
 
     Page<Map<String, Object>> getEquipListPage(@Param("page")Page<Map<String, Object>> page,@Param("factoryNum") String factoryNum,@Param("equList")String equList,@Param("equCategory")String equCategory);
 
+    void updatePromoter(@Param("id")Long id);
 }

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper">
+    <update id="updatePromoter">
+        UPDATE tzs_jg_use_registration set promoter = null
+        where sequence_nbr = #{id}
+    </update>
 
 
     <select id="getListPage" resultType="java.util.Map">
@@ -18,7 +22,8 @@
         ur.instance_id as instanceId,
         re.equ_id as equipId,
         ur.apply_no as applyNo,
-        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
         LEFT JOIN idx_biz_jg_register_info jri  on re.equ_id = jri.RECORD

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

@@ -54,7 +54,7 @@ public class JgUseRegistrationController extends BaseController {
     @PostMapping(value = "/flowExecute")
     @ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
     public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
-        jgUseRegistrationServiceImpl.flowExecute(String.valueOf(map.get("instanceId")), String.valueOf(map.get("operate")), String.valueOf(map.get("comment")), true);
+        jgUseRegistrationServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),String.valueOf(map.get("instanceId")), String.valueOf(map.get("operate")), String.valueOf(map.get("comment")), true);
         return ResponseHelper.buildResponse("ok");
     }
 

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

@@ -7,6 +7,9 @@ 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.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.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
@@ -29,7 +32,9 @@ import com.yeejoin.amos.feign.workflow.model.AjaxResult;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.ArrayList;
@@ -58,7 +63,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     WorkFlowFeignService workFlowFeginService;
     @Autowired
     private ICreateCodeService iCreateCodeService;
-
+    @Autowired
+    RedisUtils redisUtils;
     public Page<Map<String, Object>> getList(JgUseRegistrationDto dto, Page<Map<String, Object>> page ,List<String> roleIds) {
         Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds);
         return listPage;
@@ -69,6 +75,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
 
+    @Transactional
     public void save(JSONObject map) {
         UseInfo useInfo = new UseInfo();
         BeanUtil.copyProperties(map, useInfo);
@@ -96,6 +103,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
 
         if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
+            jgUseRegistration.setUseUnitCreditCode(null);
             jgUseRegistration.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
             this.getBaseMapper().updateById(jgUseRegistration);
         } else {
@@ -120,12 +128,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             } else {
                 // 启动并执行流程
                 instanceId = startByVariable();
+                jgUseRegistration.setInstanceStatus("1460532889249755137");
+                jgUseRegistration.setUseUnitCreditCode("91610131628001738N");
+                jgUseRegistration.setReceiveCompanyCode("610000");
             }
 
             if (!ObjectUtils.isEmpty(instanceId)) {
                 // 执行流程
-                String status = flowExecute(instanceId, "0", "", false);
-                jgUseRegistration.setInstanceStatus(status);
+                String status = flowExecute(jgUseRegistration.getSequenceNbr(), instanceId, "0", "", true);
                 jgUseRegistration.setAuditStatus("已提交");
                 jgUseRegistration.setStatus(UseStatusEnum.RECEIVE.getPass());
             }
@@ -150,7 +160,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return instanceId;
     }
 
-    public String flowExecute(String instanceId, String operate, String comment, Boolean update) {
+    public String flowExecute(Long id,String instanceId, String operate, String comment, Boolean update) {
         String role = "";
         String taskName = "流程结束";
         ArrayList<String> roleList = new ArrayList<>();
@@ -187,20 +197,23 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         }
         role= String.join(",", roleList);
         if (update) {
-            updateStatus(instanceId, taskName, role);
+            Boolean rollBack = "1".equals(operate) ? true : false;
+            updateStatus(id,instanceId, taskName, role, rollBack);
         }
         return role;
     }
 
-    public void updateStatus(String instanceId, String taskName, String role) {
+    public void updateStatus(Long id , String instanceId, String taskName, String role, Boolean rollBack) {
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         LambdaQueryWrapper<JgUseRegistration> lambda = new QueryWrapper<JgUseRegistration>().lambda();
-        lambda.eq(JgUseRegistration::getInstanceId, instanceId);
+        lambda.eq(JgUseRegistration::getSequenceNbr, id);
         JgUseRegistration jgUseRegistration = this.getBaseMapper().selectOne(lambda);
         if ("流程结束".equals(taskName)) {
             jgUseRegistration.setStatus(taskName);
             jgUseRegistration.setAuditStatus("已完成");
         } else {
             jgUseRegistration.setNextExecuteIds(role);
+            jgUseRegistration.setPromoter(reginParams.getUserModel().getUserId());
             if (!ObjectUtils.isEmpty(jgUseRegistration.getInstanceStatus())) {
                 jgUseRegistration.setInstanceStatus(jgUseRegistration.getInstanceStatus() + "," + role);
             } else {
@@ -209,8 +222,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             UseStatusEnum message = UseStatusEnum.getMessage(taskName);
             jgUseRegistration.setStatus(message.getPass());
         }
-
-        this.getBaseMapper().update(jgUseRegistration, lambda);
+        if (rollBack){
+            this.getBaseMapper().update(jgUseRegistration, lambda);
+            this.getBaseMapper().updatePromoter(jgUseRegistration.getSequenceNbr());
+        }else {
+            this.getBaseMapper().update(jgUseRegistration, lambda);
+        }
     }
 
     public void withdraw(String instanceId) {
@@ -218,12 +235,22 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         JgUseRegistration jgUseRegistration = new JgUseRegistration();
         LambdaQueryWrapper<JgUseRegistration> lambda = new QueryWrapper<JgUseRegistration>().lambda();
         lambda.eq(JgUseRegistration::getInstanceId, instanceId);
-
+        ArrayList<String> roleList = new ArrayList<>();
         try {
             workFlowFeginService.rollBack(instanceId);
             JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
             JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
             taskName = nextTask.getString("name");
+            if (!ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
+                String nextTaskId = nextTask.getString("id");
+                AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
+                JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
+                for (Object datum : data) {
+                    if (((Map) datum).containsKey("groupId")) {
+                        roleList.add(((Map) datum).get("groupId").toString());
+                    }
+                }
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -232,7 +259,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setStatus(message.getPass());
         }
 
-        this.getBaseMapper().update(jgUseRegistration, lambda);
+        String join = String.join(",", roleList);
+        JgUseRegistration jgUseRegistration1 = this.getBaseMapper().selectOne(lambda);
+        this.updateStatus(jgUseRegistration1.getSequenceNbr(), instanceId, taskName, join, true);
     }
 
     public void deleteBatch(List<Long> ids) {