生物防控人员

huimv-receive/src/main/java/com/huimv/receive/controller/BaseProcessController.java

@@ -32,9 +32,8 @@ public class BaseProcessController {
     }
 
     @PostMapping("/pageByLocationId")
-    public Result pageByLocationId(HttpServletRequest httpServletRequest ,@RequestBody Map<String,String> map) {
-        Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
-        return processService.pageByLocationId(map,userId);
+    public Result pageByLocationId(@RequestBody Map<String,String> map) {
+        return processService.pageByLocationId(map);
     }
 
 }

huimv-receive/src/main/java/com/huimv/receive/mapper/BaseProcessMapper.java

@@ -17,5 +17,5 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface BaseProcessMapper extends BaseMapper<BaseProcess> {
 
-    IPage<BaseProcessByLocationVo> pageByLocationId(Page<BaseProcessByLocationVo> byLocationVoPage, @Param("locationId")String locationId, @Param("userId")Integer userId);
+    IPage<BaseProcessByLocationVo> pageByLocationId( @Param("locationId")String locationId, @Param("processId")String processId);
 }

huimv-receive/src/main/java/com/huimv/receive/service/IBaseProcessService.java

@@ -20,5 +20,5 @@ public interface IBaseProcessService extends IService<BaseProcess> {
 
     Result getOne(Map<String, String> map);
 
-    Result pageByLocationId(Map<String, String> map,Integer userId);
+    Result pageByLocationId(Map<String, String> map);
 }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseProcessServiceImpl.java

@@ -55,18 +55,10 @@ public class BaseProcessServiceImpl extends ServiceImpl<BaseProcessMapper, BaseP
     }
 
     @Override
-    public Result pageByLocationId(Map<String, String> map,Integer userId) {
+    public Result pageByLocationId(Map<String, String> map) {
         String locationId = map.get("locationId");
-        Integer pageNum = Integer.parseInt(map.get("pageNum"));
-        Integer pageSize = Integer.parseInt(map.get("pageSize"));
-        if (ObjectUtil.isEmpty(pageNum) || pageNum<1)
-            pageNum = 1;
-        if (ObjectUtil.isEmpty(pageSize) || pageSize<1 )
-            pageSize = 10;
-
-        Page<BaseProcessByLocationVo> byLocationVoPage = new Page<>(pageNum,pageSize);
-
-        IPage<BaseProcessByLocationVo> userAccountVoIPage =  baseProcessMapper.pageByLocationId(byLocationVoPage,locationId,userId);
+        String processId = map.get("processId");
+        IPage<BaseProcessByLocationVo> userAccountVoIPage =  baseProcessMapper.pageByLocationId(locationId,processId);
         return new Result(ResultCode.SUCCESS,userAccountVoIPage);
     }
 }

huimv-receive/src/main/resources/com/huimv/receive/mapper/BaseProcessMapper.xml

@@ -19,18 +19,18 @@
     <select id="pageByLocationId" resultType="com.huimv.receive.entity.vo.BaseProcessByLocationVo">
 
    select *from (
-     SELECT id,farm_id ,admission_user_id ,test_location,check_date,test_location_id  ,bill_status  ,NULL as isolate_end_date ,1 as `type`   , NULL AS isolate_day_num FROM `bill_clean`
+     SELECT process_id ,id,farm_id ,admission_user_id ,test_location,check_date,test_location_id  ,bill_status  ,NULL as isolate_end_date ,1 as `type`   , NULL AS isolate_day_num FROM `bill_clean`
    UNION
-   SELECT id,farm_id,admission_user_id ,test_location,check_date,test_location_id   ,bill_status  ,NULL as isolate_end_date ,2 as `type` ,NULL AS isolate_day_num FROM  `bill_pcr`
+   SELECT process_id ,id,farm_id,admission_user_id ,test_location,check_date,test_location_id   ,bill_status  ,NULL as isolate_end_date ,2 as `type` ,NULL AS isolate_day_num FROM  `bill_pcr`
    UNION
-   SELECT  id,farm_id,admission_user_id ,test_location,check_date,test_location_id   ,bill_status  ,NULL as isolate_end_date ,3  as `type` ,null AS isolate_day_num FROM  `bill_dry`
+   SELECT process_id , id,farm_id,admission_user_id ,test_location,check_date,test_location_id   ,bill_status  ,NULL as isolate_end_date ,3  as `type` ,null AS isolate_day_num FROM  `bill_dry`
     UNION
-   SELECT  id,farm_id,admission_user_id , isolate_location as test_location,
+   SELECT process_id , id,farm_id,admission_user_id , isolate_location as test_location,
    isolate_start_date as check_date ,
    isolate_end_date ,
    isolate_end_date as test_location_id  ,bill_status, isolate_day_num,
   4 as `type`
-    FROM  `bill_isolate`) a  and a.test_location_id = #{userId} and admission_user_id  = #{locationId} order by a.check_date desc
+    FROM  `bill_isolate`) a  and a.process_id , = #{processId,} and admission_user_id  = #{locationId} order by a.check_date desc
 
     </select>