巡检问题修改

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageQuery.java

@@ -2,15 +2,19 @@ package com.yxt.anrui.scm.api.scmvehiclepatrolinspection;
 
 import com.yxt.common.core.query.Query;
 import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class AppScmVehiclePatrolinspectionPageQuery implements Query {
 
+    @ApiModelProperty("用户sid")
     private String userSid;
 
+    @ApiModelProperty("优先匹配车架号 巡检日期 存放地点")
     private String names;
 
+    @ApiModelProperty("分公司sid")
     private String useOrgSid;
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageVo.java

@@ -1,19 +1,26 @@
 package com.yxt.anrui.scm.api.scmvehiclepatrolinspection;
 
 import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
 
 @Data
 public class AppScmVehiclePatrolinspectionPageVo implements Vo {
 
+    @ApiModelProperty("记录sid")
     private String sid;
 
+    @ApiModelProperty("车架号")
     private String vin;
 
+    @ApiModelProperty("上次巡检日期")
     private String newInspectionDate;
 
+    @ApiModelProperty("上次巡检人员")
     private String newInspectionName;
 
+    @ApiModelProperty("存放地点")
     private String warehouse;
 
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java

@@ -155,6 +155,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         String s1 = "";
         String type1 = "06"; //巡检相关照片
         ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
+        scmVehiclePatrolinspectionsheet.setIsDelete(1);
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
         scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid);
         BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionService.java

@@ -164,8 +164,12 @@ public class ScmVehicleStayPatrolinspectionService extends MybatisBaseService<Sc
     private QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> appQueryWrapper(AppScmVehicleStayPatrolinspectionPageQuery query) {
         QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(query.getUseOrgSid())) {
-            qw.eq("svsi.createOrgSid", query.getUseOrgSid());
+            qw.eq("svsp.createOrgSid", query.getUseOrgSid());
         }
+        if (StringUtils.isNotBlank(query.getWarehouseSid())) {
+            qw.eq("svsp.locationSid", query.getWarehouseSid());
+        }
+        qw.eq("svsp.isDelete", "0");
         return qw;
     }
 }