F

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

@@ -31,18 +31,15 @@ import com.example.civilizedcity.service.TaIssueApplyService;
 @RequestMapping("/")
 public class TaIssueApplyController extends BaseController {
 
+    @Autowired
+    ApplicationEventPublisher applicationEventPublisher;
     @Autowired
     private TaIssueApplyService taIssueApplyService;
-
     @Autowired
     private TaIssueService taIssueService;
-
     @Autowired
     private TaOrgIssueService taOrgIssueService;
 
-    @Autowired
-    ApplicationEventPublisher applicationEventPublisher;
-
     /**
      * 通过ID查询单条数据
      *
@@ -82,22 +79,23 @@ public class TaIssueApplyController extends BaseController {
     public ResponseBean countApply(
             @ApiParam("申请状态") @RequestParam(value = "state", defaultValue = "0") Integer state,
             @ApiParam("是否删除") @RequestParam(value = "status", defaultValue = "-1") Integer status,
-                                   @ApiParam("申请类型") @RequestParam(value = "applyType", required = false) String applyType) throws Exception {
+            @ApiParam("duty") @RequestParam(value = "duty", required = false) String duty,
+            @ApiParam("申请类型") @RequestParam(value = "applyType", required = false) String applyType) throws Exception {
 
         String orgId = getOrgId();
-
+        String createUserId = currentUser().getUserId();
         QueryWrapper<TaIssueApply> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotEmpty(applyType), "apply_type", applyType);
-        queryWrapper.eq(StringUtils.isNotEmpty(orgId), "org_id", orgId);
-        queryWrapper.gt("status",status);
+        queryWrapper.eq(StringUtils.isNotEmpty(applyType), "ta.apply_type", applyType);
+        queryWrapper.eq(StringUtils.isNotEmpty(orgId), "ta.org_id", orgId);
+        queryWrapper.gt("ta.status", status);
 
         if (0 == state) {
-            queryWrapper.isNull("verify_date");
+            queryWrapper.isNull("ta.verify_date");
         } else {
-            queryWrapper.isNotNull("verify_date");
+            queryWrapper.isNotNull("ta.verify_date");
         }
 
-        long num = taIssueApplyService.count(queryWrapper);
+        long num = taIssueApplyService.counts(queryWrapper,createUserId,duty);
 
         return ResponseBean.success(num);
     }
@@ -105,7 +103,7 @@ public class TaIssueApplyController extends BaseController {
     /**
      * 通过ISSUE_ID查询单条数据
      *
-     * @param issueId 问题单ID
+     * @param issueId   问题单ID
      * @param applyType 申请类型
      * @return 实例对象
      */
@@ -143,12 +141,14 @@ public class TaIssueApplyController extends BaseController {
                              @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,
+                             @ApiParam("duty") @RequestParam(value = "duty", required = false) String duty,
                              @ApiParam(value = "是否全部") @RequestParam(value = "isAll", defaultValue = "false") Boolean isAll) throws Exception {
 
         String orgId = getOrgId();
-
+        SysUser sysUser = currentUser();
+        String createUserId = sysUser.getUserId();
         IPage<TaIssueApply> pg = new Page<>(pageNum, pageSize);
-        IPage<TaIssueApply> result = taIssueApplyService.getPageBy(pg, issueId, applyType, orgId, sourceType, isAll);
+        IPage<TaIssueApply> result = taIssueApplyService.getPageBy(pg, issueId, applyType, orgId, sourceType, isAll, duty,createUserId);
 
         return ResponseBean.success(result);
     }

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

@@ -1,12 +1,16 @@
 package com.example.civilizedcity.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.TaIssueApply;
+import org.apache.ibatis.annotations.Select;
 
- /**
+/**
  * 问题处理申请;(ta_issue_apply)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-12-27
@@ -19,8 +23,10 @@ public interface TaIssueApplyMapper  extends BaseMapper<TaIssueApply>{
                                    @Param("applyType") String applyType,
                                    @Param("orgId") String orgId,
                                    @Param("sourceType") String sourceType,
-                                   @Param("isAll") Boolean isAll);
+                                   @Param("isAll") Boolean isAll,
+                                   @Param("duty") String duty,@Param("createUserId") String createUserId);
 
      int removeByIssueId(@Param("issueId") String issueId);
 
+     long counts(@Param("ew")QueryWrapper<TaIssueApply> queryWrapper, @Param("createUserId") String createUserId,@Param("duty") String duty);
  }

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

@@ -1,5 +1,6 @@
 package com.example.civilizedcity.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaIssueApply;
@@ -13,7 +14,9 @@ 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, Boolean isAll);
+     IPage<TaIssueApply> getPageBy(IPage<TaIssueApply> pg, Integer issueId, String applyType, String orgId, String sourceType, Boolean isAll,String duty,String createUser);
 
      void verify(TaIssueApply taIssueApply, SysUser sysUser, TaIssueApply origin) throws Exception;
+
+     long counts(QueryWrapper<TaIssueApply> queryWrapper, String createUserId,String duty);
  }

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

@@ -1,5 +1,6 @@
 package com.example.civilizedcity.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.entity.*;
@@ -77,12 +78,12 @@ public class TaIssueApplyServiceImpl extends BaseServiceImpl<TaIssueApplyMapper,
     }
 
     @Override
-    public IPage<TaIssueApply> getPageBy(IPage<TaIssueApply> pg, Integer issueId, String applyType, String orgId, String sourceType, Boolean isAll) {
+    public IPage<TaIssueApply> getPageBy(IPage<TaIssueApply> pg, Integer issueId, String applyType, String orgId, String sourceType, Boolean isAll,String duty,String createUserId) {
 
         // 如果 isAll 是 false
         // 那么只查询还未审核的
 
-        return baseMapper.getPageBy(pg, issueId, applyType, orgId, sourceType, isAll);
+        return baseMapper.getPageBy(pg, issueId, applyType, orgId, sourceType, isAll,duty,createUserId);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -156,6 +157,11 @@ public class TaIssueApplyServiceImpl extends BaseServiceImpl<TaIssueApplyMapper,
         applicationEventPublisher.publishEvent(new MessagEvent(this, origin));
     }
 
+    @Override
+    public long counts(QueryWrapper<TaIssueApply> queryWrapper, String createUserId,String duty) {
+        return baseMapper.counts(queryWrapper, createUserId, duty);
+    }
+
     private void createProcessByIssue(TaIssue taIssue, SysUser sysUser, TaIssueApply taIssueApply) {
         TaIssueProcess taIssueProcess = new TaIssueProcess();
         taIssueProcess.setIssueId(taIssue.getIssueId());

src/main/resources/mapper/TaIssueApplyMapper.xml

@@ -17,6 +17,10 @@
         FROM
         ta_issue_apply t
         INNER JOIN ta_issue s ON t.issue_id = s.issue_id
+        <if test="duty != null and duty == 'inspector'">
+            and s.create_user = #{createUserId}
+        </if>
+
         WHERE
         t.`status` &gt; -1
         AND s.`status` &gt; -1
@@ -42,4 +46,15 @@
         IFNULL(t.verify_status, -1) ASC,
         t.create_date DESC
     </select>
+    <select id="counts" resultType="java.lang.Long">
+        SELECT DISTINCT
+        COUNT( * )
+        FROM
+        ta_issue_apply ta
+        INNER JOIN ta_issue ti ON ta.issue_id = ti.issue_id
+        <if test="duty != null and duty == 'inspector'">
+            AND ti.create_user = #{createUserId}
+        </if>
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

src/main/resources/mapper/TaOrgIssueMapper.xml

@@ -121,9 +121,9 @@
         INNER JOIN sys_org so on oi.org_id=so.org_id and so.`status`= 1
         WHERE
         oi.issue_id = #{issueId}
-        and oi.`status` = -2
+        and oi.`status` != -1
         ORDER BY
-        oi.create_date DESC
+        oi.create_date ASC
     </select>