faets

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

@@ -3,6 +3,7 @@ package com.example.civilizedcity.common;
 import cn.dev33.satoken.stp.StpUtil;
 import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaPerson;
+import com.example.civilizedcity.service.SysUserDutyService;
 import com.example.civilizedcity.service.SysUserService;
 import com.example.civilizedcity.service.TaPersonService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +11,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 @Component
 public class BaseController {
@@ -23,6 +25,9 @@ public class BaseController {
     @Autowired
     protected TaPersonService taPersonService;
 
+    @Autowired
+    protected SysUserDutyService sysUserDutyService;
+
     public SysUser currentUser() throws Exception {
         String loginId = StpUtil.getLoginIdAsString();
         if (StringUtils.isEmpty(loginId)) {
@@ -52,4 +57,16 @@ public class BaseController {
 
         return taPerson;
     }
+
+    public boolean isManager(SysUser sysUser) throws Exception {
+        if (Constants.ROOT_ORG.equals(sysUser.getOrgId())) return true;
+
+        List<String> dutyList = sysUserDutyService.getListByUser(sysUser.getUserId());
+        sysUser.setDutyList(dutyList);  // 添加了一点副作用
+        if (null != dutyList && (dutyList.contains(Constants.DUTY_MANAGER) || dutyList.contains(Constants.DUTY_QUERY_PERSON))) {
+            return true;
+        }
+
+        return false;
+    }
 }

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

@@ -12,6 +12,7 @@ import java.util.List;
 
 import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.SysRole;
+import com.example.civilizedcity.entity.SysUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -145,7 +146,22 @@ public class SysOrgController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/sysOrg/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) {
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        SysUser sysUser = currentUser();
+
+        if (Constants.ROOT_ID.equals(id)) {
+            return ResponseBean.error("系统机构, 禁止删除");
+        }
+
+        long count = sysOrgService.countBy("org_p_id", id, true);
+        if (count > 0) {
+            return ResponseBean.error("请先删除子级单位");
+        }
+
+        if (!Constants.ROOT_ORG.equals(sysUser.getOrgId())) {
+            return ResponseBean.error("暂无权限");
+        }
+
         sysOrgService.removeLogicById(id);
         return ResponseBean.success("success");
     }

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

@@ -13,6 +13,7 @@ import java.util.List;
 import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.event.MessagEvent;
+import com.example.civilizedcity.service.SysUserDutyService;
 import com.example.civilizedcity.service.TaIssueService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -40,6 +41,9 @@ public class TaIssueApplyController extends BaseController {
     @Autowired
     private TaIssueService taIssueService;
 
+    @Autowired
+    private SysUserDutyService sysUserDutyService;
+
     @Autowired
     ApplicationEventPublisher applicationEventPublisher;
 
@@ -66,11 +70,14 @@ public class TaIssueApplyController extends BaseController {
                                        @ApiParam("申请类型") @RequestParam("applyType") String applyType) throws Exception {
 
         SysUser sysUser = currentUser();
+        boolean isManager = isManager(sysUser);
 
         QueryWrapper<TaIssueApply> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("issue_id", issueId);
         queryWrapper.eq("apply_type", applyType);
-        queryWrapper.eq("org_id", sysUser.getOrgId());
+        if (!isManager) {
+            queryWrapper.eq("org_id", sysUser.getOrgId());
+        }
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.orderByDesc("create_date");
         queryWrapper.last("limit 1");
@@ -91,14 +98,15 @@ public class TaIssueApplyController extends BaseController {
     @GetMapping("/taIssueApply")
     public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                              @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                             @ApiParam("问题单ID") @RequestParam(value = "issueId", required = false) Integer issueId,
                              @ApiParam("申请类型") @RequestParam(value = "applyType", required = false) String applyType,
                              @ApiParam("问题单来源") @RequestParam(value = "sourceType", required = false) String sourceType) throws Exception {
 
         SysUser sysUser = currentUser();
-        String orgId = Constants.ROOT_ORG.equals(sysUser.getOrgId()) ? null : sysUser.getOrgId();
+        String orgId = isManager(sysUser) ? null : sysUser.getOrgId();
 
         IPage<TaIssueApply> pg = new Page<>(pageNum, pageSize);
-        IPage<TaIssueApply> result = taIssueApplyService.getPageBy(pg, applyType, orgId, sourceType);
+        IPage<TaIssueApply> result = taIssueApplyService.getPageBy(pg, issueId, applyType, orgId, sourceType);
 
         return ResponseBean.success(result);
     }
@@ -150,9 +158,17 @@ public class TaIssueApplyController extends BaseController {
 
         taIssueApplyService.updateById(origin);
 
-        // 清空当前申请 - 表示申请流程已走完
+        //
         taIssueService.updateApply(taIssueApply.getIssueId(), null, null);
 
+        // 如果是销单申请
+        if (Constants.APPLY_END.equals(origin.getApplyType())) {
+            if (Constants.APPLY_STATUS_PASS.equals(taIssueApply.getVerifyStatus())) {
+                // 如果通过
+                taIssueService.updateEnd(sysUser, taIssueApply.getOrgId(), taIssueApply.getIssueId());
+            }
+        }
+
 //        if (Constants.APPLY_VERIFY.equals(origin.getApplyType())) {
 //            int validateStatus = Constants.APPLY_STATUS_REJECT.equals(taIssueApply.getVerifyStatus()) ? Constants.VERIFY_REJECT : Constants.VERIFY_PASS;
 //            taIssueService.updateValidateStatus(taIssueApply.getIssueId(), validateStatus);

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

@@ -74,6 +74,7 @@ public class TaIssueProcessController extends BaseController {
         IPage<TaIssueProcess> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaIssueProcess> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("issue_id", issueId);
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.orderByDesc("create_date");
         IPage<TaIssueProcess> result = taIssueProcessService.page(pg, queryWrapper);
 

src/main/java/com/example/civilizedcity/mapper/TaIssueApplyMapper.java

@@ -15,6 +15,7 @@ import com.example.civilizedcity.entity.TaIssueApply;
 public interface TaIssueApplyMapper  extends BaseMapper<TaIssueApply>{
 
      IPage<TaIssueApply> getPageBy(IPage<TaIssueApply> pg,
+                                   @Param("issueId") Integer issueId,
                                    @Param("applyType") String applyType,
                                    @Param("orgId") String orgId,
                                    @Param("sourceType") String sourceType);

src/main/java/com/example/civilizedcity/mapper/TaIssueMapper.java

@@ -3,7 +3,6 @@ package com.example.civilizedcity.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.vo.StatVo;
-import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.TaIssue;
@@ -34,4 +33,9 @@ public interface TaIssueMapper  extends BaseMapper<TaIssue>{
      Map<String, Object> statIssueOrg(@Param("orgId") String orgId);
 
      List<StatVo> statIssueType();
+
+    int updateProcess(@Param("issueId") Integer issueId,
+                      @Param("userId") String userId,
+                      @Param("processNode") String processNode,
+                      @Param("processStatus") String processStatus);
 }

src/main/java/com/example/civilizedcity/mapper/TaOrgIssueMapper.java

@@ -28,4 +28,6 @@ public interface TaOrgIssueMapper  extends BaseMapper<TaOrgIssue>{
      TaOrgIssue getByIssueAndOrg(@Param("issueId") Integer issueId, @Param("orgId") String orgId);
 
      Map<String, Object> statMaIndex(@Param("orgId") String orgId);
- }
+
+    int updateProcess(@Param("issueId") Integer issueId,@Param("orgId") String orgId,@Param("processStatus") String processStatus);
+}

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

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

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

@@ -1,7 +1,6 @@
 package com.example.civilizedcity.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaIssue;
 import com.example.civilizedcity.entity.TaPerson;
@@ -23,4 +22,6 @@ public interface TaIssueService extends IBaseService<TaIssue> {
      void updateApply(Integer issueId, String applyType, Integer applyId);
 
      List<StatVo> statMaIndex(SysUser user, TaPerson person, String duty);
- }
+
+    void updateEnd(SysUser sysUser, String orgId, Integer issueId);
+}

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

@@ -20,7 +20,7 @@ public class SysResourceServiceImpl extends BaseServiceImpl<SysResourceMapper, S
 
     @Override
     public List<SysResource> getByUser(String userId) {
-        if (userId == Constants.ROOT_ID) {
+        if (Constants.ROOT_ID.equals(userId)) {
             QueryWrapper<SysResource> queryWrapper = new QueryWrapper<>();
             queryWrapper.gt("status", Constants.STATUS_DELETE);
             return list(queryWrapper);

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

@@ -21,7 +21,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleMapper, SysRole>
 
     @Override
     public List<SysRole> getByUser(String userId) {
-        if (userId == Constants.ROOT_ID) {
+        if (Constants.ROOT_ID.equals(userId)) {
             QueryWrapper<SysRole> queryWrapper = new QueryWrapper<>();
             queryWrapper.gt("status", Constants.STATUS_DELETE);
             return list(queryWrapper);

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

@@ -1,5 +1,6 @@
 package com.example.civilizedcity.service.impl;
 
+import com.example.civilizedcity.common.Constants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.SysUserDuty;

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

@@ -49,8 +49,6 @@ public class TaIssueApplyServiceImpl extends BaseServiceImpl<TaIssueApplyMapper,
                 throw new Exception("未找到交办单位问题单");
             }
 
-            // 标记在申请中
-            taOrgIssue.setResult(taIssueApply.getApplyType());
             taOrgIssueMapper.updateById(taOrgIssue);
         }
 
@@ -73,7 +71,7 @@ public class TaIssueApplyServiceImpl extends BaseServiceImpl<TaIssueApplyMapper,
     }
 
     @Override
-    public IPage<TaIssueApply> getPageBy(IPage<TaIssueApply> pg, String applyType, String orgId, String sourceType) {
-        return baseMapper.getPageBy(pg, applyType, orgId, sourceType);
+    public IPage<TaIssueApply> getPageBy(IPage<TaIssueApply> pg, Integer issueId, String applyType, String orgId, String sourceType) {
+        return baseMapper.getPageBy(pg, issueId, applyType, orgId, sourceType);
     }
 }

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

@@ -2,10 +2,11 @@ package com.example.civilizedcity.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.common.Constants;
-import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.SysUser;
+import com.example.civilizedcity.entity.TaIssueProcess;
 import com.example.civilizedcity.entity.TaPerson;
 import com.example.civilizedcity.mapper.TaFeedbackMapper;
+import com.example.civilizedcity.mapper.TaIssueProcessMapper;
 import com.example.civilizedcity.mapper.TaOrgIssueMapper;
 import com.example.civilizedcity.vo.StatVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +15,7 @@ import com.example.civilizedcity.entity.TaIssue;
 import com.example.civilizedcity.mapper.TaIssueMapper;
 import com.example.civilizedcity.service.TaIssueService;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -33,6 +35,9 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
     @Autowired
     TaFeedbackMapper taFeedbackMapper;
 
+    @Autowired
+    TaIssueProcessMapper taIssueProcessMapper;
+
     @Override
     public IPage<TaIssue> getPageBy(IPage<TaIssue> pg, String orgId) {
         if (null == orgId) {
@@ -100,6 +105,27 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
         return result;
     }
 
+    @Override
+    public void updateEnd(SysUser sysUser, String orgId, Integer issueId) {
+        // 问题单完成
+        baseMapper.updateProcess(issueId, sysUser.getUserId(), Constants.PROCESS_END, Constants.PROCESS_END);
+
+        // 机构问题单完成
+        taOrgIssueMapper.updateProcess(issueId, orgId, Constants.PROCESS_END);
+
+        // 流程完成
+        TaIssueProcess taIssueProcess = new TaIssueProcess();
+        taIssueProcess.setIssueId(issueId);
+        taIssueProcess.setOrgId(orgId);
+        taIssueProcess.setProcessNode(Constants.PROCESS_END);
+        taIssueProcess.setProcessStatus(Constants.PROCESS_END);
+        taIssueProcess.setCreateUser(sysUser.getUserId());
+        taIssueProcess.setCreateDate(LocalDateTime.now());
+        taIssueProcess.setStatus(Constants.STATUS_NORMAL);
+        taIssueProcessMapper.insert(taIssueProcess);
+
+    }
+
     Integer getStatValueBy(Object v, Integer def) {
         if (null == v) return def;
         return Integer.valueOf(v.toString());

src/main/resources/mapper/TaIssueApplyMapper.xml

@@ -13,6 +13,9 @@
                 INNER JOIN ta_issue s ON t.issue_id = s.issue_id
         WHERE
             t.`status` > -1
+        <if test="issueId != null">
+            AND t.issue_id = #{issueId}
+        </if>
         <if test="applyType != null and applyType != ''">
             AND t.apply_type = #{applyType}
         </if>

src/main/resources/mapper/TaIssueMapper.xml

@@ -15,6 +15,15 @@
         WHERE
             t.issue_id = #{issueId}
     </update>
+    <update id="updateProcess">
+        UPDATE ta_issue t
+        SET t.process_node = #{processNode},
+            t.process_status = #{processStatus},
+            t.update_user = #{userId},
+            t.update_date = now( )
+        WHERE
+            t.issue_id = #{issueId}
+    </update>
 
     <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaIssue">
         SELECT

src/main/resources/mapper/TaOrgIssueMapper.xml

@@ -2,6 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.civilizedcity.mapper.TaOrgIssueMapper">
+    <update id="updateProcess">
+        UPDATE ta_org_issue t
+        SET t.process_status = #{processStatus}
+        WHERE
+            t.org_id = #{orgId}
+          AND t.issue_id = #{issueId}
+    </update>
 
     <select id="getIssuePageBy" resultType="com.example.civilizedcity.entity.TaIssue">
         SELECT