单事项预审增加撤回接口

single-matter/db/add_table.sql

@@ -78,3 +78,7 @@ INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `par
 
 INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('性别', 'MatterApply', 'sexual', '1', '男', '1', '4', '0', 'sexual', NULL, NULL, NULL);
 INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('性别', 'MatterApply', 'sexual', '2', '女', '1', '4', '0', 'sexual', NULL, NULL, NULL);
+
+-- 2024-06-20
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('审批状态', 'MatterApply', 'applyState', '3', '已撤销', '1', '4', '0', 'applyState', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('审批状态', 'MatterApply', 'applyState', '-1', '审批中', '1', '4', '0', 'applyState', NULL, NULL, NULL);
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/common/utils/MatterApplyDelayTask.java

@@ -32,7 +32,7 @@ public class MatterApplyDelayTask implements Runnable, Delayed {
     @Override
     public void run() {
         MatterApplyEntity entity = matterApplyService.get(matterApplyId);
-        if(entity!=null) {
+        if(entity!=null && entity.getApplyState()==-1) {
             MatterApplyEntity update = new MatterApplyEntity();
             update.setId(entity.getId());
             update.setApplyState(0);

single-matter/src/main/java/com/mortals/xhx/module/apply/web/MatterApplyController.java

@@ -416,4 +416,39 @@ public class MatterApplyController extends BaseCRUDJsonBodyMappingController<Mat
             }
         }
     }
+
+    /**
+     * 撤回
+     * @param entity
+     * @return
+     */
+    @PostMapping({"revoke"})
+    public String applyRevoke(@RequestBody MatterApplyEntity entity) {
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        String busiDesc = "撤回" + this.getModuleDesc();
+
+        int code;
+        try {
+            entity.setApplyState(3);
+            this.service.applyExamine(entity,context);
+            model.put("id", entity.getId());
+            code = this.saveAfter(entity, model, context);
+            model.put("entity", entity);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
+        } catch (Exception var9) {
+            this.doException(this.request, busiDesc, model, var9);
+            model.put("entity", entity);
+            this.init(model, context);
+            code = this.saveException(entity, model, context, var9);
+        }
+
+        this.init(model, context);
+        JSONObject ret = new JSONObject();
+        ret.put("code", code);
+        ret.put("msg", model.remove("message_info"));
+        ret.put("data", model);
+        return ret.toJSONString();
+    }
 }
\ No newline at end of file