新增来访类型

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

@@ -45,6 +45,23 @@ public class BillCleanController {
         return new Result(ResultCode.SUCCESS,billCleanService.getById(paramsMap.get("id")));
     }
 
+    @PostMapping("/listCleanAndDry")
+    public Result listCleanAndDry(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return billCleanService.listCleanAndDry(httpServletRequest,paramsMap);
+    }
+
+    @PostMapping("/getCleanAndDryDetail")
+    public Result getCleanAndDryDetail(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        String type = paramsMap.get("type");
+        if (type.equals("1")){
+            return new Result(ResultCode.SUCCESS,billCleanService.getById(paramsMap.get("id")));
+        }else {
+            //TODO 烘干
+            return null;
+        }
+
+    }
+
     @Autowired
     private IBillCleanService cleanService;
 

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

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

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

@@ -118,4 +118,6 @@ public class BillPcr implements Serializable {
 
     private String phone;
 
+    private String carNum;
+
 }

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

@@ -130,5 +130,7 @@ public class BillPersonnelAdmission implements Serializable {
      */
     private Integer processId;
 
+    private String carNum;
+
 
 }

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

@@ -10,6 +10,7 @@ import java.time.LocalDateTime;
 public class FactoryDirectorVo {
     private Integer id;
     private String userName;
+    private String carNum;
     private Integer billStatus;
     private String isolateLocation;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")

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

@@ -1,7 +1,9 @@
 package com.huimv.admin.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.admin.entity.BillClean;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.entity.vo.CleanAndDryVo;
 
 /**
  * <p>
@@ -13,4 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface BillCleanMapper extends BaseMapper<BillClean> {
 
+    Page<CleanAndDryVo> listCleanAndDry(Page<CleanAndDryVo> page,Integer status);
+
+    Page<CleanAndDryVo> listCleanAndDry(Page<CleanAndDryVo> page);
 }

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

@@ -1,6 +1,7 @@
 package com.huimv.admin.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+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;
@@ -18,4 +19,6 @@ import java.util.List;
 public interface BillPersonnelAdmissionMapper extends BaseMapper<BillPersonnelAdmission> {
 
     IPage<FactoryDirectorVo> listAll(String type, String farmId,IPage<FactoryDirectorVo> page);
+
+    IPage<FactoryDirectorVo> listCarAll(String type, String farmId, Page<FactoryDirectorVo> page);
 }

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

@@ -26,4 +26,6 @@ public interface IBillCleanService extends IService<BillClean> {
 
     Result commitClean(HttpServletRequest httpServletRequest,Map<String,String> paramsMap) throws ParseException;
     Result listPersonalClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result listCleanAndDry(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) 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) throws IOException;
 
     Result listPersonalAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 

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

@@ -6,6 +6,7 @@ import com.huimv.admin.common.token.TokenSign;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.*;
+import com.huimv.admin.entity.vo.CleanAndDryVo;
 import com.huimv.admin.mapper.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -228,4 +229,28 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         Page<BillClean> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS,billCleanMapper.selectPage(page,new QueryWrapper<BillClean>().eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest)).orderByDesc("sub_date")));
     }
+
+    @Override
+    public Result listCleanAndDry(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String type = paramsMap.get("type");
+        String pageNo = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        Page<CleanAndDryVo> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        Page<CleanAndDryVo> cleanAndDryVoPage;
+        switch (type){
+            case "1":
+                cleanAndDryVoPage = billCleanMapper.listCleanAndDry(page,0);
+                break;
+            case "2":
+                cleanAndDryVoPage = billCleanMapper.listCleanAndDry(page,1);
+                break;
+            case "3":
+                cleanAndDryVoPage = billCleanMapper.listCleanAndDry(page,2);
+                break;
+            default:
+                cleanAndDryVoPage = billCleanMapper.listCleanAndDry(page);
+                break;
+        }
+        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) 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) throws IOException {
         Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
         if (!PhoneNumberValidator.isValidPhoneNumber(phone)) {
             return new Result(10001, "手机号格式错误！", false);
@@ -100,6 +100,9 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         billPersonnelAdmission.setWorkName(workName);
         billPersonnelAdmission.setPapersType(Integer.parseInt(papersType));
         billPersonnelAdmission.setPapersCode(papersCode);
+        if (ObjectUtil.isNotEmpty(carNum)){
+            billPersonnelAdmission.setCarNum(carNum);
+        }
         if (ObjectUtil.isNotEmpty(imgUrl)) {
             if (uploadImage.getImageCom(imgUrl).equals("上传失败")) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -239,6 +242,9 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     billPcr.setFarmId(billPersonnelAdmission.getFarmId());
                     billPcr.setProcessId(billPersonnelAdmission.getProcessId());
                     billPcr.setAdmissionId(Integer.parseInt(id));
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCarNum())){
+                        billPcr.setCarNum(billPersonnelAdmission.getCarNum());
+                    }
                     billPcr.setTestLocation(baseLocation.getLocationName());
                     billPcr.setTestLocationId(baseLocation.getId());
                     billPcrMapper.insert(billPcr);
@@ -262,7 +268,13 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         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);
+        IPage<FactoryDirectorVo> factoryDirectorList;
+        if (type.equals("0")){
+            factoryDirectorList = billPersonnelAdmissionMapper.listAll(type, farmId, page);
+        }else {
+            factoryDirectorList = billPersonnelAdmissionMapper.listCarAll(type, farmId, page);
+        }
+
         return new Result(ResultCode.SUCCESS, factoryDirectorList);
     }
 

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

@@ -22,4 +22,21 @@
         <result column="test_location_id" property="testLocationId" />
     </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
+        <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
+        <if test="status != null">
+            AND bill_status = #{status}
+        </if>
+        ORDER BY sub_date DESC
+    </select>
+
 </mapper>

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

@@ -47,4 +47,26 @@ FROM bill_personnel_admission WHERE farm_id = #{farmId} AND vistit_type = #{type
 ORDER BY sub_date DESC
     </select>
 
+
+    <select id="listCarAll" resultType="com.huimv.admin.entity.vo.FactoryDirectorVo">
+        SELECT id,car_num, bill_status, isolate_location, isolate_start_date AS check_date, isolate_start_date AS 'startTime', isolate_end_date AS 'endTime', NULL AS test_location, NULL AS vistit_type, NULL AS dest_name, NULL AS vistit_date,3 AS 'type',sub_date
+FROM bill_isolate WHERE farm_id = #{farmId} AND vistit_type = #{type}
+
+UNION ALL
+
+SELECT id,car_num, bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,2 AS 'type',sub_date
+FROM bill_clean WHERE farm_id = #{farmId} AND vistit_type = #{type}
+
+UNION ALL
+
+SELECT id,car_num, bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,1 AS 'type',sub_date
+FROM bill_pcr WHERE farm_id = #{farmId} AND vistit_type = #{type}
+
+UNION ALL
+
+SELECT id,car_num, bill_status, NULL, NULL, NULL, NULL, NULL, vistit_type, dest_name, vistit_date,0 AS 'type',sub_date
+FROM bill_personnel_admission WHERE farm_id = #{farmId} AND vistit_type = #{type}
+ORDER BY sub_date DESC
+    </select>
+
 </mapper>