采样 洗澡前查询

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

@@ -1,9 +1,13 @@
 package com.huimv.receive.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.receive.common.utils.Result;
+import com.huimv.receive.service.IBillCleanBeforeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,6 +19,15 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/bill-clean-before")
+@CrossOrigin
 public class BillCleanBeforeController {
 
+    @Autowired
+    private IBillCleanBeforeService billCleanBeforeService;
+
+    @PostMapping("/listPersonalCleanBefore")
+    public Result listPersonalCleanBefore(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return billCleanBeforeService.listPersonalCleanBefore(httpServletRequest,paramsMap);
+    }
+
 }

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

@@ -1,9 +1,13 @@
 package com.huimv.receive.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.receive.common.utils.Result;
+import com.huimv.receive.service.IBillSamplingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,6 +19,15 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/bill-sampling")
+@CrossOrigin
 public class BillSamplingController {
 
+    @Autowired
+    private IBillSamplingService billSamplingService;
+
+    @PostMapping("/listPersonalSample")
+    public Result listPersonalSample(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return billSamplingService.listPersonalSample(httpServletRequest,paramsMap);
+    }
+
 }

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

@@ -1,8 +1,12 @@
 package com.huimv.receive.service;
 
+import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.BillCleanBefore;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 洗消表 服务类
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBillCleanBeforeService extends IService<BillCleanBefore> {
 
+    Result listPersonalCleanBefore(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -1,8 +1,12 @@
 package com.huimv.receive.service;
 
+import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.BillSampling;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 洗消表 服务类
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBillSamplingService extends IService<BillSampling> {
 
+    Result listPersonalSample(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -1,11 +1,23 @@
 package com.huimv.receive.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.receive.common.token.TokenSign;
+import com.huimv.receive.common.utils.Result;
+import com.huimv.receive.common.utils.ResultCode;
 import com.huimv.receive.entity.BillCleanBefore;
+import com.huimv.receive.entity.BillSampling;
 import com.huimv.receive.mapper.BillCleanBeforeMapper;
 import com.huimv.receive.service.IBillCleanBeforeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 洗消表 服务实现类
@@ -17,4 +29,24 @@ import org.springframework.stereotype.Service;
 @Service
 public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMapper, BillCleanBefore> implements IBillCleanBeforeService {
 
+    @Autowired
+    private BillCleanBeforeMapper billCleanBeforeMapper;
+
+    @Override
+    public Result listPersonalCleanBefore(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String pageNo = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        String vistitType = paramsMap.get("vistitType");
+        Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
+        Page<BillCleanBefore> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        LambdaQueryWrapper<BillCleanBefore> queryWrapper = new QueryWrapper<BillCleanBefore>().lambda()
+                .eq(BillCleanBefore::getFarmId,farmId)
+                .eq(BillCleanBefore::getAdmissionUserId,userId)
+                .eq(ObjectUtil.isNotEmpty(vistitType),BillCleanBefore::getVistitType,vistitType)
+                .orderByDesc(BillCleanBefore::getSubDate);
+        Page<BillCleanBefore> billCleanBeforePage = billCleanBeforeMapper.selectPage(page, queryWrapper);
+        Integer count = billCleanBeforeMapper.selectCount(queryWrapper);
+        return new Result(ResultCode.SUCCESS,billCleanBeforePage,count);
+    }
 }

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

@@ -1,11 +1,22 @@
 package com.huimv.receive.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.receive.common.token.TokenSign;
+import com.huimv.receive.common.utils.Result;
+import com.huimv.receive.common.utils.ResultCode;
 import com.huimv.receive.entity.BillSampling;
 import com.huimv.receive.mapper.BillSamplingMapper;
 import com.huimv.receive.service.IBillSamplingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 洗消表 服务实现类
@@ -17,4 +28,24 @@ import org.springframework.stereotype.Service;
 @Service
 public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, BillSampling> implements IBillSamplingService {
 
+    @Autowired
+    private BillSamplingMapper billSamplingMapper;
+
+    @Override
+    public Result listPersonalSample(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String pageNo = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        String vistitType = paramsMap.get("vistitType");
+        Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
+        Page<BillSampling> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        LambdaQueryWrapper<BillSampling> queryWrapper = new QueryWrapper<BillSampling>().lambda()
+                .eq(BillSampling::getFarmId,farmId)
+                .eq(BillSampling::getAdmissionUserId, userId)
+                .eq(ObjectUtil.isNotEmpty(vistitType), BillSampling::getVistitType, vistitType)
+                .orderByDesc(BillSampling::getSubDate);
+        Page<BillSampling> billSamplingPage = billSamplingMapper.selectPage(page,queryWrapper);
+        Integer count = billSamplingMapper.selectCount(queryWrapper);
+        return new Result(ResultCode.SUCCESS,billSamplingPage,count);
+    }
 }