feats

src/main/java/com/example/civilizedcity/common/Constants.java

@@ -47,19 +47,19 @@ public class Constants {
      * 流程节点
      */
     // 待交办
-    public final static String PROCESS_START = "00";
+    public final static String PROCESS_START = "01";
     // 交办
-    public final static String PROCESS_ASSIGNED = "01";
+    public final static String PROCESS_ASSIGNED = "02";
     // 办结
-    public final static String PROCESS_END = "02";
+    public final static String PROCESS_END = "03";
     // 驳回申请
-    public final static String PROCESS_APPLY_REJECT = "0101";
+    public final static String PROCESS_APPLY_REJECT = "0201";
     // 延期申请
-    public final static String PROCESS_APPLY_DELAY = "0102";
+    public final static String PROCESS_APPLY_DELAY = "0202";
     // 单位审核
-    public final static String PROCESS_APPLY_VERIFY = "0103";
+    public final static String PROCESS_APPLY_VERIFY = "0203";
     // 办结申请
-    public final static String PROCESS_APPLY_END = "0104";
+    public final static String PROCESS_APPLY_END = "0204";
 
     /**
      * 审核结果

src/main/java/com/example/civilizedcity/controller/SysLoginController.java

@@ -67,9 +67,11 @@ public class SysLoginController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/sysLogin")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody SysLogin sysLogin) throws Exception {
+        SysLogin origin = sysLoginService.getExistBy("user_id", sysLogin.getUserId(), false, true);
 
-        if (null == sysLogin.getLoginId()) {
+        if (null == origin) {
             // 新增
+            sysLogin.setLoginId(null);
             String password = EncryptUtils.md5(sysLogin.getPassword(), sysLogin.getUserId());
             sysLogin.setPassword(password);
             sysLogin.setStatus(Constants.STATUS_NORMAL);
@@ -79,9 +81,10 @@ public class SysLoginController extends BaseController {
             // 更新
             if (!StringUtils.isEmpty(sysLogin.getPassword())) {
                 String password = EncryptUtils.md5(sysLogin.getPassword(), sysLogin.getUserId());
-                sysLogin.setPassword(password);
+                origin.setPassword(password);
             }
-            sysLoginService.updateById(sysLogin);
+            origin.setAccount(sysLogin.getAccount());
+            sysLoginService.updateById(origin);
         }
 
         sysLogin.setPassword(null);

src/main/java/com/example/civilizedcity/controller/TaIssueApplyController.java

@@ -155,6 +155,19 @@ public class TaIssueApplyController extends BaseController {
         taIssueApply.setApplyId(id);
         taIssueApplyService.verify(taIssueApply, sysUser, origin);
 
+        // 如果单位审核通过
+        // 直接提销单申请
+        if (taIssueApply.getApplyType().equals(Constants.PROCESS_APPLY_VERIFY) && taIssueApply.getVerifyStatus().equals(Constants.APPLY_PASS)) {
+            TaIssueApply newIssueApply = new TaIssueApply();
+            newIssueApply.setIssueId(taIssueApply.getIssueId());
+            newIssueApply.setApplyType(Constants.PROCESS_APPLY_END);
+            newIssueApply.setContent(taIssueApply.getContent());
+            newIssueApply.setRemark(taIssueApply.getRemark());
+            newIssueApply.setStatus(Constants.STATUS_NORMAL);
+
+            taIssueApplyService.createNewApply(newIssueApply, sysUser);
+        }
+
         return ResponseBean.success(origin);
     }
 

src/main/java/com/example/civilizedcity/controller/TaIssueController.java

@@ -80,6 +80,7 @@ public class TaIssueController extends BaseController {
                              @ApiParam("问题单状态") @RequestParam(value = "bizStatus", required = false) String bizStatus,
                              @ApiParam("来源") @RequestParam(value = "sourceType", required = false) String sourceType,
                              @ApiParam("点位") @RequestParam(value = "locId", required = false) String locId,
+                             @ApiParam("我的") @RequestParam(value = "mine", defaultValue = "false") Boolean mine,
                              @ApiParam("责任单位") @RequestParam(value = "orgId", required = false) String orgId) throws Exception {
 
         SysUser sysUser = currentUser();
@@ -112,9 +113,7 @@ public class TaIssueController extends BaseController {
             queryWrapper.eq("process_status", Constants.APPLY_PASS);
         }
 
-        // 督察员
-        if (dutyList.contains(Constants.DUTY_INSPECTOR) && !dutyList.contains(Constants.DUTY_MANAGER)) {
-            // 督察员
+        if (mine) {
             queryWrapper.eq("create_user", sysUser.getUserId());
         }
 

src/main/java/com/example/civilizedcity/service/impl/TaIssueApplyServiceImpl.java

@@ -153,8 +153,10 @@ public class TaIssueApplyServiceImpl extends BaseServiceImpl<TaIssueApplyMapper,
 
     // 问题单审核
     public void verifyIssue(TaIssueApply taIssueApply, TaIssue taIssue, TaOrgIssue taOrgIssue) throws Exception {
+        taIssue.setProcessNode(Constants.PROCESS_ASSIGNED);
         taIssue.setProcessStatus(taIssueApply.getVerifyStatus());
-        //
+
+        taOrgIssue.setProcessNode(Constants.PROCESS_ASSIGNED);
         taOrgIssue.setProcessStatus(taIssue.getProcessStatus());
     }
 
@@ -162,11 +164,12 @@ public class TaIssueApplyServiceImpl extends BaseServiceImpl<TaIssueApplyMapper,
     public void verifyReject(TaIssueApply taIssueApply, TaIssue taIssue, TaOrgIssue taOrgIssue) throws Exception {
         if (Constants.APPLY_REJECT.equals(taIssueApply.getVerifyStatus())) {
             // 如果审核不通过
+            taIssue.setProcessNode(Constants.PROCESS_ASSIGNED);
             taIssue.setProcessStatus(Constants.APPLY_REJECT);
             taIssue.setProcessNum(taIssue.getProcessNum() + 1); // 交办次数 + 1
 
             // 单位相当于重新开始
-            taOrgIssue.setProcessNode(Constants.PROCESS_START);
+            taOrgIssue.setProcessNode(Constants.PROCESS_ASSIGNED);
             taOrgIssue.setProcessStatus(taIssue.getProcessStatus()); // 但是状态是审核不通过
         } else {
             taIssue.setProcessNode(Constants.PROCESS_START); // 问题单重新开始
@@ -185,23 +188,26 @@ public class TaIssueApplyServiceImpl extends BaseServiceImpl<TaIssueApplyMapper,
 
     // 延期审核
     public void verifyDelay(TaIssueApply taIssueApply, TaIssue taIssue, TaOrgIssue taOrgIssue) throws Exception {
-        if (Constants.APPLY_REJECT.equals(taIssueApply.getVerifyStatus())) {
-            // 如果审核不通过
-            taIssue.setProcessStatus(Constants.APPLY_REJECT);
-            taOrgIssue.setProcessStatus(taIssue.getProcessStatus());
-        } else {
-            taIssue.setProcessStatus(Constants.APPLY_PASS);
+        if (Constants.APPLY_PASS.equals(taIssueApply.getVerifyStatus())) {
             taIssue.setExpireDate(taIssueApply.getContent()); // 更新延期日期
-
-            taOrgIssue.setProcessStatus(taIssue.getProcessStatus());
         }
+
+        taIssue.setProcessNode(Constants.PROCESS_ASSIGNED);
+        taIssue.setProcessStatus(taIssueApply.getVerifyStatus());
+
+        taOrgIssue.setProcessNode(Constants.PROCESS_ASSIGNED);
+        taOrgIssue.setProcessStatus(taIssueApply.getVerifyStatus());
     }
 
     // 销单审核
     public void verifyEnd(TaIssueApply taIssueApply, TaIssue taIssue, TaOrgIssue taOrgIssue) throws Exception {
         if (Constants.APPLY_REJECT.equals(taIssueApply.getVerifyStatus())) {
             // 如果审核不通过
+            taIssue.setProcessNode(Constants.PROCESS_ASSIGNED);
             taIssue.setProcessStatus(Constants.APPLY_REJECT);
+            taIssue.setProcessNum(taIssue.getProcessNum() + 1); // 交办次数 + 1
+
+            taOrgIssue.setProcessNode(Constants.PROCESS_ASSIGNED);
             taOrgIssue.setProcessStatus(taIssue.getProcessStatus());
         } else {
             taIssue.setProcessNode(Constants.PROCESS_END);

src/main/java/com/example/civilizedcity/service/impl/TaMessageServiceImpl.java

@@ -24,6 +24,10 @@ import java.time.LocalDateTime;
 @Service
 public class TaMessageServiceImpl extends BaseServiceImpl<TaMessageMapper, TaMessage> implements TaMessageService {
 
+    /**
+     * 平台流程
+     * @param taIssue
+     */
     @Async
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -54,6 +58,10 @@ public class TaMessageServiceImpl extends BaseServiceImpl<TaMessageMapper, TaMes
         }
     }
 
+    /**
+     * 单位流程
+     * @param taIssueApply
+     */
     @Async
     @Transactional(rollbackFor = Exception.class)
     @Override

src/main/resources/application.yml

@@ -53,8 +53,8 @@ yz:
 
 wx:
   miniapp:
-    appid: wxe44244d1a5ea3364
-    secret: b7dbbb7b51d40aa716115e76721ed3ff
+    appid: wx39d721c54a0a11c4
+    secret: e970bf3e11f4dbf71ad91581c99702e6
     token:
     aesKey:
 

src/main/resources/mapper/TaAttachMapper.xml

@@ -4,13 +4,12 @@
 <mapper namespace="com.example.civilizedcity.mapper.TaAttachMapper">
     <delete id="deleteNotIn">
         DELETE
-            t
         FROM
             ta_attach
         WHERE
-            t.owner_type = #{ownerType}
-          AND t.owner_id = #{ownerId}
-          AND t.id NOT IN
+            owner_type = #{ownerType}
+          AND owner_id = #{ownerId}
+          AND attach_id NOT IN
         <foreach item="item" collection="idList" separator="," open="(" close=")" index="">
             #{item}
         </foreach>