调整架构，审核流程未完成

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

@@ -140,14 +140,14 @@ public class TaIssueApplyController extends BaseController {
             return ResponseBean.error("未找到申请数据");
         }
 
-        SysUser sysUser = currentUser();
+        // 如果是审核驳回
+        if (StringUtils.isEmpty(taIssueApply.getVerifyDesc()) && Constants.APPLY_STATUS_REJECT.equals(taIssueApply.getVerifyStatus())) {
+            return ResponseBean.error("请填写驳回理由");
+        }
 
-//        // 如果是问题单审核
-//        if (Constants.APPLY_VERIFY.equals(origin.getApplyType())) {
-//            if (StringUtils.isEmpty(taIssueApply.getVerifyDesc()) && Constants.APPLY_STATUS_REJECT.equals(taIssueApply.getVerifyStatus())) {
-//                return ResponseBean.error("请填写驳回理由");
-//            }
-//        }
+        SysUser sysUser = currentUser();
+        taIssueApply.setApplyId(id);
+        taIssueApplyService.verify(taIssueApply, sysUser, origin);
 
         origin.setVerifyStatus(taIssueApply.getVerifyStatus());
         origin.setVerifyDesc(taIssueApply.getVerifyDesc());

src/main/java/com/example/civilizedcity/service/TaIssueApplyService.java

@@ -15,4 +15,6 @@ public interface TaIssueApplyService extends IBaseService<TaIssueApply> {
      void createNewApply(TaIssueApply taIssueApply, SysUser sysUser) throws Exception;
 
      IPage<TaIssueApply> getPageBy(IPage<TaIssueApply> pg, Integer issueId, String applyType, String orgId, String sourceType);
+
+     void verify(TaIssueApply taIssueApply, SysUser sysUser, TaIssueApply origin) throws Exception;
  }

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

@@ -1,9 +1,11 @@
 package com.example.civilizedcity.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.ResponseBean;
 import com.example.civilizedcity.entity.SysUser;
+import com.example.civilizedcity.entity.TaIssue;
 import com.example.civilizedcity.entity.TaOrgIssue;
 import com.example.civilizedcity.event.MessagEvent;
 import com.example.civilizedcity.mapper.TaIssueMapper;
@@ -14,6 +16,7 @@ import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.TaIssueApply;
 import com.example.civilizedcity.mapper.TaIssueApplyMapper;
 import com.example.civilizedcity.service.TaIssueApplyService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 
@@ -74,4 +77,74 @@ public class TaIssueApplyServiceImpl extends BaseServiceImpl<TaIssueApplyMapper,
     public IPage<TaIssueApply> getPageBy(IPage<TaIssueApply> pg, Integer issueId, String applyType, String orgId, String sourceType) {
         return baseMapper.getPageBy(pg, issueId, applyType, orgId, sourceType);
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void verify(TaIssueApply taIssueApply, SysUser sysUser, TaIssueApply origin) throws Exception {
+        // 先更新审核信息
+        origin.setVerifyStatus(taIssueApply.getVerifyStatus());
+        origin.setVerifyDesc(taIssueApply.getVerifyDesc());
+        origin.setVerifyOrg(sysUser.getOrgId());
+        origin.setVerifyUser(sysUser.getUserId());
+        origin.setVerifyUserName(sysUser.getName());
+        origin.setVerifyDate(LocalDateTime.now());
+        updateById(origin);
+
+        // 再判断审核类型
+        switch (origin.getApplyType()) {
+            case Constants.APPLY_VERIFY:
+                // 问题单审核
+                verifyIssue();
+                break;
+            case Constants.APPLY_REJECT:
+                // 问题单驳回
+                verifyReject();
+                break;
+            case Constants.APPLY_DELAY:
+                // 延期申请
+                verifyDelay(taIssueApply, origin);
+                break;
+            case Constants.APPLY_END:
+                // 销单申请
+                break;
+            default:
+                // 其他
+                break;
+        }
+
+    }
+
+    // 问题单审核
+    public void verifyIssue() throws Exception {
+        // TODO;
+    }
+
+    // 驳回审核
+    public void verifyReject() throws Exception {
+        // TODO;
+    }
+
+    // 延期审核
+    public void verifyDelay(TaIssueApply taIssueApply, TaIssueApply origin) throws Exception {
+        if (Constants.APPLY_STATUS_REJECT.equals(taIssueApply.getVerifyStatus())) {
+            // 如果审核不通过
+            // TODO;
+        } else {
+            // 问题单截止日期更新为申请的截止日期
+            // 问题单的申请关联清空
+            UpdateWrapper<TaIssue> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.set("expire_date", taIssueApply.getContent());
+            updateWrapper.set("apply_type", null);
+            updateWrapper.set("apply_id", null);
+            updateWrapper.eq("issue_id", origin.getIssueId());
+
+        }
+    }
+
+    // 问题单审核
+    public void verifyIssue() throws Exception {
+        // TODO;
+    }
+
+
 }

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

@@ -17,6 +17,7 @@ import com.example.civilizedcity.service.TaIssueService;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -97,6 +98,9 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
         // 市民
         else {
             Map<String, Object> res = taFeedbackMapper.statMaIndex(person.getPersonId());
+            if (null == res) {
+                res = new HashMap<>();
+            }
             result.add(new StatVo().setName("未处理").setValue(getStatValueBy(res.get("unassigned_num"), 0)));
             result.add(new StatVo().setName("已处理").setValue(getStatValueBy(res.get("assigned_num"), 0) + getStatValueBy(res.get("end_num"), 0)));
             result.add(new StatVo().setName("已打回").setValue(getStatValueBy(res.get("reject_num"), 0)));