app 盘库，巡检，移位 bug修改

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

@@ -1,5 +1,6 @@
 package com.yxt.anrui.scm.api.scmvehiclepatrolinspection;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.query.Query;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,8 +12,22 @@ public class AppScmVehiclePatrolinspectionPageQuery implements Query {
     @ApiModelProperty("用户sid")
     private String userSid;
 
-    @ApiModelProperty("优先匹配车架号 巡检日期 存放地点")
-    private String names;
+    @ApiModelProperty("优先匹配车架号")
+    private String name;
+
+    @ApiModelProperty("巡检日期 示例 2020-02-01至2022-03-31")
+    private String date;
+
+    @ApiModelProperty("盘库开始日期")
+    @JsonProperty("patrolinspectionStartDate")
+    private String patrolinspectionStartDate;
+
+    @ApiModelProperty("盘库结束日期")
+    @JsonProperty("patrolinspectionEndDate")
+    private String patrolinspectionEndDate;
+
+    @ApiModelProperty("存放地点sid")
+    private String warehouseSid;
 
     @ApiModelProperty("分公司sid")
     private String useOrgSid;

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -371,7 +371,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
 
         List<ScmFile> scmFiles2 = scmFileService.selectByLinkSid(sid, type2);
         for (ScmFile scmFile : scmFiles2) {
-            policyImage.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
+            image.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
         }
         vo.setImage(image);
         return vo;

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java

@@ -71,5 +71,5 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper<ScmVehicleP
      * @param names
      * @return
      */
-    IPage<AppScmVehiclePatrolinspectionPageVo> getCarInventoryList(IPage<AppScmVehiclePatrolinspectionPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehiclePatrolinspectionPageVo> qw, @Param("names") String names);
+    IPage<AppScmVehiclePatrolinspectionPageVo> getCarInventoryList(IPage<AppScmVehiclePatrolinspectionPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehiclePatrolinspectionPageVo> qw, @Param("name") String name);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml

@@ -27,8 +27,8 @@
         scm_vehicle_patrolinspection svp
         <where>
             ${ew.sqlSegment}
-            <if test="names != '' and names != null ">
-                and concat(svp.mainSid,svp.patrolInspectionDate ,svp.location) LIKE concat('%', #{names}, '%')
+            <if test="name != '' and name != null ">
+                and concat(svp.mainSid) LIKE concat('%', #{name}, '%')
             </if>
         </where>
         ORDER BY id DESC

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java

@@ -71,12 +71,12 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
     public PagerVo<ScmVehiclePatrolinspectionVo> listPageVo(PagerQuery<ScmVehiclePatrolinspectionQuery> pq) {
         ScmVehiclePatrolinspectionQuery query = pq.getParams();
         QueryWrapper<ScmVehiclePatrolinspection> qw = new QueryWrapper<>();
-        qw.eq("createOrgSid",query.getCreateOrgSid());
-        if (StringUtils.isNotBlank(query.getMainSid())){
-            qw.like("mainSid",query.getMainSid());
+        qw.eq("createOrgSid", query.getCreateOrgSid());
+        if (StringUtils.isNotBlank(query.getMainSid())) {
+            qw.like("mainSid", query.getMainSid());
         }
-        if (StringUtils.isNotBlank(query.getLocationSid())){
-            qw.like("locationSid",query.getLocationSid());
+        if (StringUtils.isNotBlank(query.getLocationSid())) {
+            qw.like("locationSid", query.getLocationSid());
         }
         String patrolInspectionStartDate = query.getPatrolInspectionStartDate();
         String patrolInspectionEndDate = query.getPatrolInspectionEndDate();
@@ -131,9 +131,16 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
         IPage<AppScmVehiclePatrolinspectionPageQuery> page = PagerUtil.queryToPage(pagerQuery);
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
         pagerQuery.getParams().setUseOrgSid(useOrgSid);
+        AppScmVehiclePatrolinspectionPageQuery paramsQuery = pagerQuery.getParams();
+        String date = paramsQuery.getDate();
+        if (StringUtils.isNotBlank(date)) {
+            String[] s = date.split("至");
+            paramsQuery.setPatrolinspectionStartDate(s[0]);
+            paramsQuery.setPatrolinspectionEndDate(s[1]);
+        }
         QueryWrapper<AppScmVehiclePatrolinspectionPageVo> qw = appCarQueryWrapper(pagerQuery.getParams());
         AppScmVehiclePatrolinspectionPageQuery params = pagerQuery.getParams();
-        IPage<AppScmVehiclePatrolinspectionPageVo> iPage = baseMapper.getCarInventoryList(page, qw, params.getNames());
+        IPage<AppScmVehiclePatrolinspectionPageVo> iPage = baseMapper.getCarInventoryList(page, qw, params.getName());
         return iPage;
     }
 
@@ -148,6 +155,14 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
         if (StringUtils.isNotBlank(query.getUseOrgSid())) {
             qw.eq("svp.createOrgSid", query.getUseOrgSid());
         }
+        if (StringUtils.isNotBlank(query.getWarehouseSid())) {
+            qw.eq("svp.locationSid", query.getWarehouseSid());
+        }
+        String patrolinspectionStartDate = query.getPatrolinspectionStartDate();
+        String patrolinspectionEndDate = query.getPatrolinspectionEndDate();
+        qw.apply(StringUtils.isNotEmpty(patrolinspectionStartDate), "date_format (patrolInspectionDate,'%Y-%m-%d') >= date_format('" + patrolinspectionStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(patrolinspectionEndDate), "date_format (patrolInspectionDate,'%Y-%m-%d') <= date_format('" + patrolinspectionEndDate + "','%Y-%m-%d')"
+                );
         return qw;
     }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionPageQuery.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.supplychain.inspection;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -11,8 +12,22 @@ public class PatrolinspectionPageQuery implements Query {
     @ApiModelProperty("用户sid")
     private String userSid;
 
-    @ApiModelProperty("优先匹配车架号 巡检日期 存放地点")
-    private String names;
+    @ApiModelProperty("优先匹配车架号")
+    private String name;
+
+    @ApiModelProperty("巡检日期 示例 2020-02-01至2022-03-31")
+    private String date;
+
+    @ApiModelProperty("盘库开始日期")
+    @JsonProperty("patrolinspectionStartDate")
+    private String patrolinspectionStartDate;
+
+    @ApiModelProperty("盘库结束日期")
+    @JsonProperty("patrolinspectionEndDate")
+    private String patrolinspectionEndDate;
+
+    @ApiModelProperty("存放地点sid")
+    private String warehouseSid;
 
     @ApiModelProperty("分公司sid")
     private String useOrgSid;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDto.java

@@ -78,11 +78,11 @@ public class AppGressionDto implements Dto {
     private String operator;
 
     @ApiModelProperty("保险状态")
-    @JsonProperty("insurance")
+    @JsonProperty("insuranceState")
     private String InsuranceState;
 
     @ApiModelProperty("保险状态")
-    @JsonProperty("insuranceKey")
+    @JsonProperty("insuranceStateKey")
     private String InsuranceStateKey;
 
     @ApiModelProperty("保单照片")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java

@@ -74,9 +74,11 @@ public class AppGressionInfoVo implements Vo {
     private String operator;
 
     @ApiModelProperty("保险状态")
+    @JsonProperty("insuranceState")
     private String InsuranceState;
 
     @ApiModelProperty("保险状态")
+    @JsonProperty("insuranceStateKey")
     private String InsuranceStateKey;
 
     @ApiModelProperty("保单照片")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java

@@ -113,6 +113,9 @@ public class AppScmVehicleGressionService {
     }
 
     public ResultBean saveCarTransferSiteImage(AppCarTransferSiteImageDto dto) {
-        return null;
+        AppScmVehicleCarTransferSiteImageDto appScmVehicleCarTransferSiteImageDto = new AppScmVehicleCarTransferSiteImageDto();
+        BeanUtil.copyProperties(dto, appScmVehicleCarTransferSiteImageDto);
+        ResultBean resultBean = scmVehicleGressionFeign.saveCarTransferSiteImage(appScmVehicleCarTransferSiteImageDto);
+        return resultBean;
     }
 }