分页

huimv-admin/src/main/java/com/huimv/admin/mapper/BillPersonnelAdmissionMapper.java

@@ -1,5 +1,6 @@
 package com.huimv.admin.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huimv.admin.entity.BillPersonnelAdmission;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.admin.entity.vo.FactoryDirectorVo;
@@ -16,5 +17,5 @@ import java.util.List;
  */
 public interface BillPersonnelAdmissionMapper extends BaseMapper<BillPersonnelAdmission> {
 
-    List<FactoryDirectorVo> listAll(String type, String farmId);
+    IPage<FactoryDirectorVo> listAll(String type, String farmId,IPage<FactoryDirectorVo> page);
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -2,6 +2,7 @@ package com.huimv.admin.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.core.toolkit.StringUtils;
 import com.huimv.admin.common.token.TokenSign;
 import com.huimv.admin.common.utils.DataUill;
@@ -239,7 +240,10 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     public Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String type = paramsMap.get("type");
         String farmId = paramsMap.get("farmId");
-        List<FactoryDirectorVo> factoryDirectorList = billPersonnelAdmissionMapper.listAll(type,farmId);
+        String pageNo = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        Page<FactoryDirectorVo> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        IPage<FactoryDirectorVo> factoryDirectorList = billPersonnelAdmissionMapper.listAll(type,farmId,page);
         return new Result(ResultCode.SUCCESS,factoryDirectorList);
     }
 
@@ -272,34 +276,26 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     @Override
     public Result listPrc(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String type = paramsMap.get("type");//类型
-        String pageNum = paramsMap.get("pageNum");
-        String pageSize = paramsMap.get("pageSize");
-        if ("".equals(pageNum) || null == pageNum) {
-            pageNum = "1";
-        }
-        if ("".equals(pageSize) || null == pageSize) {
-            pageSize = "20";
-        }
-        Page<BillPcr> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         if ("".equals(type) || null == type) {
             type = "0";
         }
         String farmId = paramsMap.get("farmId");
         QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).eq("test_location_id",TokenSign.getWorkIdByJwtToken(httpServletRequest));
+        queryWrapper.eq("farm_id", farmId).eq("pcr_type", 1).eq("test_location_id",TokenSign.getWorkIdByJwtToken(httpServletRequest));
         if ("0".equals(type)) {
-            queryWrapper.in("pcr_type",  1, 2, 3);
+            queryWrapper.in("bill_status", 0, 1, 2, 3);
         }
         if ("1".equals(type)) {
-            queryWrapper.eq("pcr_type", 1);
+            queryWrapper.eq("bill_status", 0);
         }
         if ("2".equals(type)) {
-            queryWrapper.eq("pcr_type", 2);
+            queryWrapper.eq("bill_status", 1);
         }
         if ("3".equals(type)) {
-            queryWrapper.eq("pcr_type",  3);
+            queryWrapper.in("bill_status", 2, 3);
         }
-        return new Result(ResultCode.SUCCESS,  pcrMapper.selectPage(page,queryWrapper));
+        List<BillPcr> billPcrs = pcrMapper.selectList(queryWrapper);
+        return new Result(ResultCode.SUCCESS, billPcrs);
     }
 
     @Override
@@ -314,7 +310,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         String type = paramsMap.get("type");
         String id = paramsMap.get("id");
         String data = paramsMap.get("data");
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         if (StringUtils.isBlank(data)) {
             data = sdf.format(new Date());
         }
@@ -335,7 +331,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             if (billPcr.getDestId() > billPcr.getTestLocationId()) { //说明当前不是目的地
                 if ("1".equals(type)) {
                     billPcr.setBillStatus(1);
-                    billPcr.setPcrType(2);
                     billPcr.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
                     billPcr.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                     billPcr.setTestLocation(baseLocation.getLocationName());
@@ -374,7 +369,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     return new Result(10000, "修改成功！", true);
                 } else {
                     billPcr.setBillStatus(2);
-                    billPcr.setPcrType(3);
                     billPcr.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
                     billPcr.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                     billPcr.setTestLocation(baseLocation.getLocationName());
@@ -397,7 +391,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             } else {
                 if ("1".equals(type)) {
                     billPcr.setBillStatus(1);
-                    billPcr.setPcrType(2);
                     billPcr.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
                     billPcr.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                     billPcr.setTestLocation(baseLocation.getLocationName());
@@ -424,7 +417,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     baseProcess.setCurrentStatus(substring + "2");
                     baseProcess.setProcessType(2);
                     billPcr.setBillStatus(2);
-                    billPcr.setPcrType(3);
                     billPcr.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
                     billPcr.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                     billPcr.setTestLocation(baseLocation.getLocationName());
@@ -444,15 +436,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     @Override
     public Result listIsolate(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String type = paramsMap.get("type");//类型
-        String pageNum = paramsMap.get("pageNum");
-        String pageSize = paramsMap.get("pageSize");
-        if ("".equals(pageNum) || null == pageNum) {
-            pageNum = "1";
-        }
-        if ("".equals(pageSize) || null == pageSize) {
-            pageSize = "20";
-        }
-        Page<BillIsolate> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         if ("".equals(type) || null == type) {
             type = "0";
         }
@@ -471,7 +454,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         if ("3".equals(type)) {
             queryWrapper.in("bill_status", 2, 3);
         }
-        return new Result(ResultCode.SUCCESS, isolateMapper.selectPage(page,queryWrapper));
+        return new Result(ResultCode.SUCCESS, isolateMapper.selectList(queryWrapper));
     }
 
     @Override
@@ -486,10 +469,11 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         Date startDate = billIsolate.getIsolateStartDate();
         Integer dayNum = billIsolate.getIsolateDayNum();//隔离天数
         Date endDate = DataUill.getNextDay(startDate, dayNum);
+        isolate.setIsolateLocation(billIsolate.getIsolateLocation());
+        isolate.setIsolateLocationId(billIsolate.getIsolateLocationId());
         isolate.setIsolateStartDate(startDate);
         isolate.setIsolateEndDate(endDate);
         isolate.setIsolateDayNum(dayNum);
-        isolate.setBillStatus(1);
         isolateMapper.updateById(isolate);
         return new Result(10000, "提交成功！", true);
     }
@@ -575,15 +559,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     @Override
     public Result listClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String type = paramsMap.get("type");//类型
-        String pageNum = paramsMap.get("pageNum");
-        String pageSize = paramsMap.get("pageSize");
-        if ("".equals(pageNum) || null == pageNum) {
-            pageNum = "1";
-        }
-        if ("".equals(pageSize) || null == pageSize) {
-            pageSize = "20";
-        }
-        Page<BillClean> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         if ("".equals(type) || null == type) {
             type = "0";
         }
@@ -602,7 +577,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         if ("3".equals(type)) {
             queryWrapper.eq("bill_status", 2);
         }
-        return new Result(ResultCode.SUCCESS,  cleanMapper.selectPage(page,queryWrapper));
+        return new Result(ResultCode.SUCCESS,  cleanMapper.selectList(queryWrapper));
 
     }
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/SysAccountMultilevelServiceImpl.java

@@ -174,7 +174,7 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
             sysAccountMultilevel.setPapersCode(papersCode);
         }
         accountMultilevelMapper.updateById(sysAccountMultilevel);
-        return Result.SUCCESS();
+        return new Result(ResultCode.SUCCESS,sysAccountMultilevel);
     }
 
 }