F

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

@@ -167,7 +167,60 @@ public class TaOrgIssueController extends BaseController {
     }
 
 
+    /**
+     * 分页查询
+     *
+     * @param pageNum 当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @ApiOperation("分页查询")
+    @GetMapping("/taOrgIssue/issue")
+    public ResponseBean listIssue(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                             @ApiParam("问题单ID") @RequestParam(value = "issueId", required = false) String issueId,
+                             @ApiParam("status") @RequestParam(value = "status", required = false) String status,
+                             @ApiParam("点位") @RequestParam(value = "locId", required = false) String locId,
+                             @ApiParam("数据来源") @RequestParam(value ="sourceType", required = false) String sourceType,
+                             @ApiParam("类型ID") @RequestParam(value = "typeId", required = false) String typeId,
+                             @ApiParam("上报人") @RequestParam(value = "userName", required = false) String userName,
+                             @ApiParam(value = "创建时间-开始", example = "2023-03-01") @RequestParam(value = "createDateStart", required = false) String createDateStart,
+                             @ApiParam(value = "创建时间-结束", example = "2023-03-31") @RequestParam(value = "createDateEnd", required = false) String createDateEnd,
+                             @ApiParam(value = "结单时间-开始", example = "2023-03-01") @RequestParam(value = "endDateStart", required = false) String endDateStart,
+                             @ApiParam(value = "结单时间-结束", example = "2023-03-31") @RequestParam(value = "endDateEnd", required = false) String endDateEnd,
+                             @ApiParam("业务状态") @RequestParam(value ="bizStatus", required = false) String bizStatus) throws Exception {
+        SysUser sysUser = currentUser();
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("issueId", issueId);
+        params.put("status", status);
+        params.put("typeId", typeId);
+        params.put("bizStatus", bizStatus);
+        params.put("sourceType", sourceType);
+        params.put("locId", locId);
+        params.put("orgId", sysUser.getOrgId());
+        params.put("userName", userName);
+        if (StringUtils.isNotEmpty(createDateStart)) {
+            params.put("createDateStart", DateUtils.day2LocalDateime(createDateStart));
+            params.put("createDateEnd", DateUtils.day2LocalDateime2(createDateEnd));
+        } else {
+            params.put("createDateStart", null);
+            params.put("createDateEnd", null);
+        }
 
+        if (StringUtils.isNotEmpty(endDateStart)) {
+            params.put("endDateStart", DateUtils.day2LocalDateime(endDateStart));
+            params.put("endDateEnd", DateUtils.day2LocalDateime2(endDateEnd));
+        } else {
+            params.put("endDateStart", null);
+            params.put("endDateEnd", null);
+        }
+
+        IPage<TaIssue> pg = new Page<>(pageNum, pageSize);
+        IPage<TaIssue> result = taOrgIssueService.getIssuePageIssue(pg, params);
+
+        return ResponseBean.success(result);
+    }
 
 
 

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

@@ -31,4 +31,6 @@ public interface TaOrgIssueMapper  extends BaseMapper<TaOrgIssue>{
     int removeByIssueId(@Param("issueId") String issueId);
 
     List<TaOrgIssue> getByListIssueId(@Param("issueId") Integer issueId);
+
+    IPage<TaIssue> getIssuePageIssue(IPage<TaIssue> pg,@Param("params") Map<String, Object> params);
 }

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

@@ -33,4 +33,6 @@ public interface TaOrgIssueService extends IBaseService<TaOrgIssue> {
 
 
      List<TaOrgIssue> getByListIssueId(Integer issueId);
+
+     IPage<TaIssue> getIssuePageIssue(IPage<TaIssue> pg, Map<String, Object> params);
 }

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

@@ -205,4 +205,9 @@ public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaO
         return baseMapper.getByListIssueId(issueId);
     }
 
+    @Override
+    public IPage<TaIssue> getIssuePageIssue(IPage<TaIssue> pg, Map<String, Object> params) {
+        return baseMapper.getIssuePageIssue(pg ,params);
+    }
+
 }

src/main/resources/mapper/TaOrgIssueMapper.xml

@@ -30,10 +30,7 @@
         WHERE
         s.issue_id = t.issue_id
         AND s.org_id = t.org_id
-        <if test="params.status != null and params.status != ''">
-            AND s.`status` = #{params.status}
-        </if>
-
+        AND s.`status` &gt; -1
         )
         AND t.org_id = #{params.orgId}
         <if test="params.issueId != null and params.issueId != ''">
@@ -124,6 +121,24 @@
         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
+        ORDER BY
+        oi.create_date DESC
+    </select>
+
+
 
+    <select id="getIssuePageIssue" resultType="com.example.civilizedcity.entity.TaIssue">
+        SELECT DISTINCT t.* from  ta_org_issue io
+        INNER JOIN 	ta_issue t on io.issue_id=t.issue_id and t.`status` &gt; 1
+        and t.source_type IN ( 'check', 'inspector' )
+        WHERE
+        io.org_id=#{params.orgId}
+        AND io.`status` = -2
+        <if test="params.issueId != null and params.issueId != ''">
+            AND t.issue_id = #{params.issueId}
+        </if>
+        ORDER BY
+        t.create_date DESC
     </select>
 </mapper>