生物防控人员

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

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

huimv-receive/src/main/java/com/huimv/receive/entity/vo/BaseProcessByLocationVo.java

@@ -0,0 +1,33 @@
+package com.huimv.receive.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class BaseProcessByLocationVo {
+    private Integer id;
+
+    private String farmId;
+
+    private Integer admissionUserId;
+
+    private String testLocation;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private Date checkDate;
+
+    private Integer testLocationId;
+
+    private Integer billStatus;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private Date isolateEndDate;
+
+    private Integer type;
+
+    private String isolateDayNum;
+
+
+}

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

@@ -1,7 +1,11 @@
 package com.huimv.receive.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.receive.entity.BaseProcess;
+import com.huimv.receive.entity.vo.BaseProcessByLocationVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.huimv.receive.entity.BaseProcess;
  */
 public interface BaseProcessMapper extends BaseMapper<BaseProcess> {
 
+    IPage<BaseProcessByLocationVo> pageByLocationId(Page<BaseProcessByLocationVo> byLocationVoPage, @Param("locationId")String locationId, @Param("userId")Integer userId);
 }

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

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

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

@@ -2,12 +2,16 @@ package com.huimv.receive.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.common.utils.ResultCode;
 import com.huimv.receive.entity.BaseLocation;
 import com.huimv.receive.entity.BaseProcess;
+import com.huimv.receive.entity.vo.BaseProcessByLocationVo;
 import com.huimv.receive.entity.vo.BaseProcessVo;
+import com.huimv.receive.entity.vo.UserAccountVo;
 import com.huimv.receive.mapper.BaseProcessMapper;
 import com.huimv.receive.service.IBaseLocationService;
 import com.huimv.receive.service.IBaseProcessService;
@@ -30,7 +34,7 @@ import java.util.Map;
 public class BaseProcessServiceImpl extends ServiceImpl<BaseProcessMapper, BaseProcess> implements IBaseProcessService {
 
     @Autowired
-    private IBaseLocationService baseLocationService;
+    private BaseProcessMapper baseProcessMapper;
     @Override
     public Result getOne(Map<String, String> map) {
         String id = map.get("processId");
@@ -47,7 +51,22 @@ public class BaseProcessServiceImpl extends ServiceImpl<BaseProcessMapper, BaseP
             list.add(baseProcessVo);
         }
 
-
         return new Result(ResultCode.SUCCESS,list);
     }
+
+    @Override
+    public Result pageByLocationId(Map<String, String> map,Integer userId) {
+        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);
+        return new Result(ResultCode.SUCCESS,userAccountVoIPage);
+    }
 }

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

@@ -107,7 +107,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (ObjectUtil.isEmpty(pageNum) || pageNum<1)
             pageNum = 1;
         if (ObjectUtil.isEmpty(pageSize) || pageSize<1 )
-            pageNum = 10;
+            pageSize = 10;
 //        wrapper.eq("farm_id",farmId);
         wrapper.eq(ObjectUtil.isNotEmpty(job),"job",job);
         wrapper.eq(ObjectUtil.isNotEmpty(workLocation),"work_location",workLocation);

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

@@ -16,5 +16,22 @@
         <result column="farm_id" property="farmId" />
         <result column="process_type" property="processType" />
     </resultMap>
+    <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`
+   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`
+   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`
+    UNION
+   SELECT  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
+
+    </select>
 
 </mapper>