更新

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java

@@ -929,16 +929,22 @@ public class CheckController extends AbstractBaseController {
         }
     }
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/people/page", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @RequestMapping(value = "/people/page", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
     public CommonResponse getPeoplePatrolPage(
-            @RequestBody(required = false) CheckInfoPageParam param,
-            CommonPageable commonPageable) {
+            @RequestParam(required = false) String bizOrgCode,
+            @RequestParam(required = false) String userId,
+            int pageNumber,
+            int pageSize) {
+        CheckInfoPageParam param = new CheckInfoPageParam();
+        param.setBizOrgCode(bizOrgCode);
+        param.setUserId(userId);
         ReginParams reginParams = getSelectedOrgInfo();
         param.setOrderBy("checkDate desc");
-        param.setBizOrgCode(ObjectUtils.isEmpty(param.getBizOrgCode()) ?
-                "3".equals(param.getIsOK()) ? null : reginParams.getPersonIdentity().getBizOrgCode()
-                : param.getBizOrgCode());
+        param.setBizOrgCode(ObjectUtils.isEmpty(param.getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : param.getBizOrgCode());
+        CommonPageable commonPageable = new CommonPageable();
+        commonPageable.setPageNumber(pageNumber);
+        commonPageable.setPageSize(pageSize);
         if(commonPageable !=null){
             param.setPageNumber(commonPageable.getPageNumber()-1);
             param.setPageSize(commonPageable.getPageSize());

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java

@@ -176,11 +176,10 @@ public class CheckServiceImpl implements ICheckService {
         }
         content = checkMapper.getPeopleCheckPage(param);
         for (CheckInfoVo infoVo : content) {
-            String checkId = planTaskMapper.getCheckIdByDetailId(infoVo.getId());
             FeignClientResult responseModel = new FeignClientResult();
             List result = new ArrayList();
             try {
-                responseModel = idxFeign.queryDefectByCodes(new ArrayList<>(), checkId);
+                responseModel = idxFeign.queryDefectByCodes(new ArrayList<>(), infoVo.getId());
                 result = (List) responseModel.getResult();
             } catch (Exception e) {
                 e.printStackTrace();

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -332,7 +332,7 @@
         </choose>
     </select>
 
-    <select id="getPeoplePageCount" resultMap="long">
+    <select id="getPeoplePageCount" resultType="long">
         SELECT
             count(1)
         FROM
@@ -366,14 +366,14 @@
         WHEN `a`.`is_ok` = 3
         THEN '漏检'
         END
-        ) as is_ok,
-        b.biz_org_name AS bizOrgName
+        ) as is_ok
         FROM
         `p_check` `a`
         <trim prefix="WHERE" prefixOverrides="AND ">
+            `a`.`is_ok` != 1
             <if test="userId!=null and userId!=''">and find_in_set(#{userId}, a.user_id) > 0</if>
             <if test="bizOrgCode != null and bizOrgCode != ''">
-                and  a.org_code LIKE CONCAT(#{bizOrgCode},'%')
+                and a.org_code LIKE CONCAT(#{bizOrgCode},'%')
             </if>
         </trim>
         order by ${orderBy}