生物安全添加后台数据统计接口

huimv-admin/src/main/java/com/huimv/admin/controller/BillPersonnelAdmissionController.java

@@ -154,4 +154,10 @@ public class BillPersonnelAdmissionController {
     public Result editDry(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
         return admissionService.editDry(httpServletRequest, paramsMap);
     }
+
+    //后台
+    @RequestMapping("/countAdmission")
+    public Result countAdmission(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return admissionService.countAdmission(httpServletRequest, paramsMap);
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/entity/vo/ListAdmissionVo.java

@@ -0,0 +1,11 @@
+package com.huimv.admin.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class ListAdmissionVo {
+    private Integer count;
+    private Integer type;
+    private Integer passCount;
+    private Integer refuseCount;
+}

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

@@ -1,10 +1,14 @@
 package com.huimv.admin.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.admin.entity.BillPersonnelAdmission;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.admin.entity.vo.FactoryDirectorVo;
+import com.huimv.admin.entity.vo.ListAdmissionVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -21,4 +25,6 @@ public interface BillPersonnelAdmissionMapper extends BaseMapper<BillPersonnelAd
     IPage<FactoryDirectorVo> listAll(String type, String farmId,IPage<FactoryDirectorVo> page);
 
     IPage<FactoryDirectorVo> listCarAll(String type, String farmId, Page<FactoryDirectorVo> page);
+
+    List<ListAdmissionVo> countAdmission(@Param(Constants.WRAPPER)QueryWrapper<BillPersonnelAdmission> queryWrapper);
 }

huimv-admin/src/main/java/com/huimv/admin/service/IBillPersonnelAdmissionService.java

@@ -57,4 +57,7 @@ public interface IBillPersonnelAdmissionService extends IService<BillPersonnelAd
     Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result getDetail(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    //后台数据报表
+    Result countAdmission(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 }

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

@@ -1,6 +1,7 @@
 package com.huimv.admin.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -15,6 +16,7 @@ import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.*;
 import com.huimv.admin.entity.vo.BillAdmissionAndGoods;
 import com.huimv.admin.entity.vo.CleanAndDryVo2;
+import com.huimv.admin.entity.vo.ListAdmissionVo;
 import com.huimv.admin.mapper.*;
 import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -226,7 +228,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         Page<BillPersonnelAdmission> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
         Page<BillPersonnelAdmission> billPersonnelAdmissionPage = billPersonnelAdmissionMapper.selectPage(page, queryWrapper);
         QueryWrapper<BillPersonnelAdmission> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("farm_id",farmId);
+        queryWrapper1.eq("farm_id", farmId);
         if (userType == 3) {
             //生物安全负责人
             queryWrapper1.eq("admission_type", 0);
@@ -235,7 +237,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             queryWrapper1.ne("admission_type", 0);
         }
         queryWrapper1.eq("bill_status", 0);
-        return new Result(ResultCode.SUCCESS, billPersonnelAdmissionPage,billPersonnelAdmissionMapper.selectList(queryWrapper1).size());
+        return new Result(ResultCode.SUCCESS, billPersonnelAdmissionPage, billPersonnelAdmissionMapper.selectList(queryWrapper1).size());
     }
 
     @Override
@@ -330,7 +332,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             factoryDirectorList = billPersonnelAdmissionMapper.listCarAll(type, farmId, page);
         }
 
-        return new Result(ResultCode.SUCCESS, factoryDirectorList,factoryDirectorList.getSize());
+        return new Result(ResultCode.SUCCESS, factoryDirectorList, factoryDirectorList.getSize());
     }
 
     @Override
@@ -355,6 +357,65 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         }
     }
 
+    @Override
+    public Result countAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String type = paramsMap.get("type");
+        if ("".equals(type) || type == null) {
+            type = "1";
+        }
+        List<ListAdmissionVo> admissionVo = null;
+        QueryWrapper<BillPersonnelAdmission> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        //默认今日
+        if ("1".equals(type)) {
+            Date timesmorning = DataUill.getTimesmorning();
+            queryWrapper.ge("sub_date", timesmorning);
+            admissionVo = billPersonnelAdmissionMapper.countAdmission(queryWrapper);
+            for (ListAdmissionVo listAdmissionVo : admissionVo) {
+                QueryWrapper<BillPersonnelAdmission> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("farm_id", farmId).ge("sub_date", timesmorning)
+                        .eq("vistit_type", listAdmissionVo.getType()).eq("bill_status", 1);
+                QueryWrapper<BillPersonnelAdmission> queryWrapper2 = new QueryWrapper<>();
+                queryWrapper2.eq("farm_id", farmId).ge("sub_date", timesmorning)
+                        .eq("vistit_type", listAdmissionVo.getType()).eq("bill_status", 2);
+                listAdmissionVo.setPassCount(billPersonnelAdmissionMapper.selectCount(queryWrapper1));
+                listAdmissionVo.setRefuseCount(billPersonnelAdmissionMapper.selectCount(queryWrapper2));
+            }
+        } else if ("2".equals(type)) {
+            // 本周
+            DateTime dateTime = DateUtil.beginOfWeek(new Date());
+            queryWrapper.ge("sub_date", dateTime);
+            admissionVo = billPersonnelAdmissionMapper.countAdmission(queryWrapper);
+            for (ListAdmissionVo listAdmissionVo : admissionVo) {
+                QueryWrapper<BillPersonnelAdmission> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("farm_id", farmId).ge("sub_date", dateTime)
+                        .eq("vistit_type", listAdmissionVo.getType()).eq("bill_status", 1);
+                QueryWrapper<BillPersonnelAdmission> queryWrapper2 = new QueryWrapper<>();
+                queryWrapper2.eq("farm_id", farmId).ge("sub_date", dateTime)
+                        .eq("vistit_type", listAdmissionVo.getType()).eq("bill_status", 2);
+                listAdmissionVo.setPassCount(billPersonnelAdmissionMapper.selectCount(queryWrapper1));
+                listAdmissionVo.setRefuseCount(billPersonnelAdmissionMapper.selectCount(queryWrapper2));
+            }
+        } else {
+            //本月
+            Date timesMonthmorning = DataUill.getTimesMonthmorning();
+            queryWrapper.ge("sub_date", timesMonthmorning);
+            admissionVo = billPersonnelAdmissionMapper.countAdmission(queryWrapper);
+            for (ListAdmissionVo listAdmissionVo : admissionVo) {
+                QueryWrapper<BillPersonnelAdmission> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("farm_id", farmId).ge("sub_date", timesMonthmorning)
+                        .eq("vistit_type", listAdmissionVo.getType()).eq("bill_status", 1);
+                QueryWrapper<BillPersonnelAdmission> queryWrapper2 = new QueryWrapper<>();
+                queryWrapper2.eq("farm_id", farmId).ge("sub_date", timesMonthmorning)
+                        .eq("vistit_type", listAdmissionVo.getType()).eq("bill_status", 2);
+                listAdmissionVo.setPassCount(billPersonnelAdmissionMapper.selectCount(queryWrapper1));
+                listAdmissionVo.setRefuseCount(billPersonnelAdmissionMapper.selectCount(queryWrapper2));
+            }
+        }
+        return new Result(ResultCode.SUCCESS, admissionVo);
+    }
+
     @Autowired
     private BillPcrMapper pcrMapper;
     @Autowired
@@ -399,8 +460,8 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         }
         QueryWrapper<BillPcr> queryWrapper1 = new QueryWrapper<>();
 
-        queryWrapper1.eq("farm_id", farmId).orderByDesc("sub_date").eq("pcr_type",1);
-        return new Result(ResultCode.SUCCESS, pcrMapper.selectPage(page, queryWrapper),pcrMapper.selectCount(queryWrapper1));
+        queryWrapper1.eq("farm_id", farmId).orderByDesc("sub_date").eq("pcr_type", 1);
+        return new Result(ResultCode.SUCCESS, pcrMapper.selectPage(page, queryWrapper), pcrMapper.selectCount(queryWrapper1));
     }
 
     @Override
@@ -577,7 +638,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         }
         QueryWrapper<BillIsolate> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("farm_id", farmId).orderByDesc("sub_date").eq("bill_status", 0);
-        return new Result(ResultCode.SUCCESS, isolateMapper.selectPage(page, queryWrapper),isolateMapper.selectCount(queryWrapper1));
+        return new Result(ResultCode.SUCCESS, isolateMapper.selectPage(page, queryWrapper), isolateMapper.selectCount(queryWrapper1));
     }
 
     @Override
@@ -819,9 +880,9 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         }
         String farmId = paramsMap.get("farmId");
         QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).ne("vistit_type", 0).orderByDesc("sub_date").eq("img_status",1);
+        queryWrapper.eq("farm_id", farmId).ne("vistit_type", 0).orderByDesc("sub_date").eq("img_status", 1);
         QueryWrapper<BillDry> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("farm_id", farmId).ne("vistit_type", 0).orderByDesc("sub_date").eq("img_status",1);
+        queryWrapper1.eq("farm_id", farmId).ne("vistit_type", 0).orderByDesc("sub_date").eq("img_status", 1);
         if ("0".equals(type)) {
             cleanAndDryVo2Page = cleanMapper.CleanAndDry2(page, farmId, "0,1,2".split(","));
         }
@@ -841,11 +902,11 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             String[] s = arrayList.toArray(new String[arrayList.size()]);
             cleanAndDryVo2Page = cleanMapper.CleanAndDry2(page, farmId, s);
         }
-        queryWrapper.eq("bill_status",0);
-        queryWrapper1.eq("bill_status",0);
+        queryWrapper.eq("bill_status", 0);
+        queryWrapper1.eq("bill_status", 0);
         Integer integer = cleanMapper.selectCount(queryWrapper);
         Integer integer1 = dryMapper.selectCount(queryWrapper1);
-        return new Result(ResultCode.SUCCESS, cleanAndDryVo2Page,integer+integer1);
+        return new Result(ResultCode.SUCCESS, cleanAndDryVo2Page, integer + integer1);
 
     }
 

huimv-admin/src/main/resources/com/huimv/admin/mapper/BillPersonnelAdmissionMapper.xml

@@ -74,4 +74,10 @@ FROM bill_personnel_admission WHERE farm_id = #{farmId} AND vistit_type = #{type
 ORDER BY sub_date DESC
     </select>
 
+    <select id="countAdmission" resultType="com.huimv.admin.entity.vo.ListAdmissionVo">
+        select count(*) count, vistit_type type from bill_personnel_admission
+        ${ew.customSqlSegment}
+        group by vistit_type
+    </select>
+
 </mapper>