司机查询洗消

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

@@ -40,6 +40,11 @@ public class BillCleanController {
         return billCleanService.listPersonalClean(httpServletRequest,paramsMap);
     }
 
+    @PostMapping("/listPersonalCleanAndDry")
+    public Result listPersonalCleanAndDry(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return billCleanService.listPersonalCleanAndDry(httpServletRequest,paramsMap);
+    }
+
     @PostMapping("/getDetail")
     public Result getDetail(@RequestBody Map<String, String> paramsMap){
         return new Result(ResultCode.SUCCESS,billCleanService.getById(paramsMap.get("id")));

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

@@ -55,8 +55,9 @@ public class BillPersonnelAdmissionController {
                                @RequestParam("destId") String destId,
                                @RequestParam("destName") String destName,
                                @RequestParam(value = "carNum",required = false) String carNum,
+                               @RequestParam(value = "source",required = false) String source,
                                @RequestParam("farmId") String farmId) throws IOException {
-        return billPersonnelAdmissionService.addAdmission(httpServletRequest,admissionType,vistitType,userName,phone,workName,papersType,papersCode,imgUrl,img,vistitDate,vistitReson,destId,destName,farmId,carNum);
+        return billPersonnelAdmissionService.addAdmission(httpServletRequest,admissionType,vistitType,userName,phone,workName,papersType,papersCode,imgUrl,img,vistitDate,vistitReson,destId,destName,farmId,carNum,source);
     }
 
     @PostMapping("/listPersonalAdmission")

huimv-admin/src/main/java/com/huimv/admin/entity/BillPersonnelAdmission.java

@@ -132,5 +132,7 @@ public class BillPersonnelAdmission implements Serializable {
 
     private String carNum;
 
+    private String source;
+
 
 }

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

@@ -13,6 +13,8 @@ public class CleanAndDryVo {
 
     private String testLocation;
 
+    private String carNum;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime checkDate;
 

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

@@ -15,7 +15,9 @@ import com.huimv.admin.entity.vo.CleanAndDryVo;
  */
 public interface BillCleanMapper extends BaseMapper<BillClean> {
 
-    Page<CleanAndDryVo> listCleanAndDry(Page<CleanAndDryVo> page,Integer status);
+    Page<CleanAndDryVo> listCleanAndDry(Page<CleanAndDryVo> page,Integer farmId,Integer status);
 
-    Page<CleanAndDryVo> listCleanAndDry(Page<CleanAndDryVo> page);
+    Page<CleanAndDryVo> listCleanAndDry(Page<CleanAndDryVo> page,Integer farmId);
+
+    Page<CleanAndDryVo> listPersonalCleanAndDry(Page<CleanAndDryVo> page, Integer userId);
 }

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

@@ -28,4 +28,6 @@ public interface IBillCleanService extends IService<BillClean> {
     Result listPersonalClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result listCleanAndDry(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result listPersonalCleanAndDry(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -40,7 +40,7 @@ public interface IBillPersonnelAdmissionService extends IService<BillPersonnelAd
     Result editIsolate(HttpServletRequest httpServletRequest, Map<String,String> paramsMap) throws ParseException;
 
     Result listClean(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
-    Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName, String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl,String img, String vistitDate, String vistitReson, String destId, String destName, String farmId, String carNum) throws IOException;
+    Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName, String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl,String img, String vistitDate, String vistitReson, String destId, String destName, String farmId, String carNum,String source) throws IOException;
 
     Result listPersonalAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 

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

@@ -239,18 +239,29 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         Page<CleanAndDryVo> cleanAndDryVoPage;
         switch (type){
             case "1":
-                cleanAndDryVoPage = billCleanMapper.listCleanAndDry(page,0);
+                cleanAndDryVoPage = billCleanMapper.listCleanAndDry(page,Integer.parseInt(TokenSign.getFarmIds(httpServletRequest)),0);
                 break;
             case "2":
-                cleanAndDryVoPage = billCleanMapper.listCleanAndDry(page,1);
+                cleanAndDryVoPage = billCleanMapper.listCleanAndDry(page,Integer.parseInt(TokenSign.getFarmIds(httpServletRequest)),1);
                 break;
             case "3":
-                cleanAndDryVoPage = billCleanMapper.listCleanAndDry(page,2);
+                cleanAndDryVoPage = billCleanMapper.listCleanAndDry(page,Integer.parseInt(TokenSign.getFarmIds(httpServletRequest)),2);
                 break;
             default:
-                cleanAndDryVoPage = billCleanMapper.listCleanAndDry(page);
+                cleanAndDryVoPage = billCleanMapper.listCleanAndDry(page,Integer.parseInt(TokenSign.getFarmIds(httpServletRequest)));
                 break;
         }
+
+        return new Result(ResultCode.SUCCESS,cleanAndDryVoPage);
+    }
+
+    @Override
+    public Result listPersonalCleanAndDry(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String pageNo = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        Page<CleanAndDryVo> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
+        Page<CleanAndDryVo> cleanAndDryVoPage = cleanMapper.listPersonalCleanAndDry(page,userId);
         return new Result(ResultCode.SUCCESS,cleanAndDryVoPage);
     }
 }

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

@@ -76,7 +76,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName, String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl, String img, String vistitDate, String vistitReson, String destId, String destName, String farmId,String carNum) throws IOException {
+    public Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName, String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl, String img, String vistitDate, String vistitReson, String destId, String destName, String farmId,String carNum,String source) throws IOException {
         Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
         if (!PhoneNumberValidator.isValidPhoneNumber(phone)) {
             return new Result(10001, "手机号格式错误！", false);
@@ -113,6 +113,9 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         if (ObjectUtil.isNotEmpty(img)) {
             billPersonnelAdmission.setImgUrl(img);
         }
+        if (ObjectUtil.isNotEmpty(source)){
+            billPersonnelAdmission.setSource(source);
+        }
         billPersonnelAdmission.setVistitReson(vistitReson);
         billPersonnelAdmission.setFarmId(Integer.parseInt(farmId));
         BaseProcess baseProcess = new BaseProcess();

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

@@ -23,20 +23,31 @@
     </resultMap>
 
     <select id="listCleanAndDry" resultType="com.huimv.admin.entity.vo.CleanAndDryVo">
-        SELECT id,bill_status,test_location,check_date,vistit_type,sub_date,1 AS 'type'
-        FROM `bill_clean` WHERE farm_id = 25 AND vistit_type != 0
+        SELECT id,car_num,bill_status,test_location,check_date,vistit_type,sub_date,1 AS 'type'
+        FROM `bill_clean` WHERE farm_id = #{farmId} AND vistit_type != 0
         <if test="status != null">
             AND bill_status = #{status}
         </if>
 
         UNION ALL
 
-        SELECT id,bill_status,test_location,check_date,vistit_type,sub_date,2 AS 'type'
-        FROM `bill_dry` WHERE farm_id = 25 AND vistit_type != 0
+        SELECT id,car_num,bill_status,test_location,check_date,vistit_type,sub_date,2 AS 'type'
+        FROM `bill_dry` WHERE farm_id = #{farmId} AND vistit_type != 0
         <if test="status != null">
             AND bill_status = #{status}
         </if>
         ORDER BY sub_date DESC
     </select>
 
+    <select id="listPersonalCleanAndDry" resultType="com.huimv.admin.entity.vo.CleanAndDryVo">
+        SELECT id,car_num,bill_status,test_location,check_date,vistit_type,sub_date,1 AS 'type'
+        FROM `bill_clean` WHERE admission_user_id = #{userId} AND vistit_type != 0
+
+        UNION ALL
+
+        SELECT id,car_num,bill_status,test_location,check_date,vistit_type,sub_date,2 AS 'type'
+        FROM `bill_dry` WHERE admission_user_id = #{userId} AND vistit_type != 0
+        ORDER BY sub_date DESC
+    </select>
+
 </mapper>