简易订单，巡检问题修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java

@@ -212,5 +212,5 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
 
     int selectCount();
 
-    List<String> checkConfigNameBySid(@Param("sid") String sid,@Param("createOrgSid") String createOrgSid);
+    List<String> checkConfigNameBySid(@Param("sid") String sid, @Param("createOrgSid") String createOrgSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@@ -230,8 +230,8 @@
                bmc.multimedia,
                bv.guidedPrice
         FROM base_vehicle bv
-                     LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
-                     LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
+                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
         WHERE bvm.sid = #{modelSid}
     </select>
     <select id="selectAppConfigListByModelSid2"
@@ -266,16 +266,16 @@
                 FROM base_vehmodel_config bvc
                 WHERE bvc.configurationItemsSid = bmc.sid) AS priceValidity
         FROM base_vehmodel_config bvc
-                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
-                     LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
         WHERE bvm.sid = #{modelSid}
     </select>
 
     <select id="selectVehicleQuantity" resultType="java.lang.String">
         SELECT count(*)
         FROM base_model_config bmc
-                     LEFT JOIN base_vehmodel_config bvc ON bvc.configurationItemsSid = bmc.sid
-                     LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+                 LEFT JOIN base_vehmodel_config bvc ON bvc.configurationItemsSid = bmc.sid
+                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
         WHERE bmc.sid = #{sid}
           AND bvm.sid = #{modelSid}
     </select>
@@ -304,8 +304,8 @@
                bmc.multimedia,
                bmc.otherConfig
         FROM base_vehmodel_config bvc
-                     LEFT JOIN base_model_config bmc ON bmc.sid = bvc.configurationItemsSid
-                     LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvc.modelSid
+                 LEFT JOIN base_model_config bmc ON bmc.sid = bvc.configurationItemsSid
+                 LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvc.modelSid
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid = #{useOrg}
@@ -482,8 +482,8 @@
                bmc.multimedia,
                bmc.otherConfig
         FROM bus_vehicle_apply_detail bvad
-                     LEFT JOIN base_model_config bmc ON bmc.sid = bvad.configSid
-                     LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvad.vehicleSid
+                 LEFT JOIN base_model_config bmc ON bmc.sid = bvad.configSid
+                 LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvad.vehicleSid
         WHERE bmc.sid = #{configSid}
           AND bvm.sid = #{modelSid}
     </select>
@@ -501,15 +501,15 @@
                bvm.driveFormValue,
                bvm.fuelTypeValue,
                bvm.gearboxTypeValue,
-               bvm.marketSegmentsValue as marketSegments,
-               bvm.departmentValue as department,
+               bvm.marketSegmentsValue                                            as marketSegments,
+               bvm.departmentValue                                                as department,
                bvm.emissionStandardValue,
                bvm.engineTypeValue,
                bvm.announcementModel,
                bvm.specifications,
                bvm.insideCode
         FROM base_vehicle_model bvm
-                     LEFT JOIN base_vehmodel_config bvc ON bvc.modelSid = bvm.sid
+                 LEFT JOIN base_vehmodel_config bvc ON bvc.modelSid = bvm.sid
         where bvm.sid = #{modelSid}
           and bvc.useOrgSid = #{useOrgSid}
     </select>
@@ -578,7 +578,7 @@
                (select SUM(distinct cast((cast(bo.platformNo as signed) -
                                           IFNULL(cast(bo.lockingNum as signed), '0')) as signed)) as quantity
                 from bus_vehicle_order bo
-                             LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid
+                         LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid
                 where bo.useOrgSid = bvc.useOrgSid
                   and bd.vehicleSid = #{modelSid}
                   and bd.configSid = #{configSid})  AS produceCarNum
@@ -616,8 +616,8 @@
 --                bv.salePrice as price,
                bmc.otherConfig
         FROM base_vehicle bv
-                     LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
-                     LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
+                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
         WHERE bvm.sid = #{modelSid}
           AND bmc.sid = #{configSid}
     </select>
@@ -643,7 +643,9 @@
         bmc.independentSources,
         bmc.fuelTank,
         bmc.multimedia,
-        bvc.guidedPrice as price,
+        if(MIN(bvc.guidedPrice) = MAX(bvc.guidedPrice), convert(MAX(bvc.guidedPrice) / 10000, decimal (10, 2)),
+        CONCAT(convert(MIN(bvc.guidedPrice) / 10000, decimal (10, 2)), '-',
+        convert(MAX(bvc.guidedPrice) / 10000, decimal (10, 2)))) AS price,
         bvc.priceValidity,
         bvm.sid as modelSid,
         bvm.vehicleAlias as modelName,
@@ -772,6 +774,7 @@
     <select id="checkByConfigName" resultType="java.lang.String">
         SELECT CONCAT(configName, otherConfig) configNameOther
         FROM base_model_config
-        WHERE isDelete = 0 AND createOrg = #{createOrgSid}
+        WHERE isDelete = 0
+          AND createOrg = #{createOrgSid}
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java

@@ -609,6 +609,9 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         //配置列表
         IPage<ModelConfigListQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<AppModelConfigListVo> qw = modelConfigQueryWrapper(pagerQuery.getParams());
+
+
+
         List<AppModelConfigListVo> appModelConfigListVos = baseMapper.getNowConfigList(page, qw, orgSid, VehicleState.LockEnum.UN_LOCK.getCode());
         long pages = page.getPages();
         vo.setPages((int) pages);
@@ -859,7 +862,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         return baseMapper.selectCount();
     }
 
-    public List<String> checkConfigNameBySid(String sid,String createOrgSid) {
-        return baseMapper.checkConfigNameBySid(sid,createOrgSid);
+    public List<String> checkConfigNameBySid(String sid, String createOrgSid) {
+        return baseMapper.checkConfigNameBySid(sid, createOrgSid);
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -630,7 +630,9 @@
         bvm.vehicleVersionValue AS versionValue,
         bvm.fuelTypeValue,
         bvm.gearboxTypeValue,
-        (SELECT CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice))
+        (SELECT if(MIN(bvc.guidedPrice) = MAX(bvc.guidedPrice), convert(MAX(bvc.guidedPrice) / 10000, decimal (10, 2)),
+        CONCAT(convert(MIN(bvc.guidedPrice) / 10000, decimal (10, 2)), '-',
+        convert(MAX(bvc.guidedPrice) / 10000, decimal (10, 2))))
         FROM base_vehmodel_config bvc
         WHERE bvc.modelSid = bvm.sid
         AND bvc.useOrgSid = #{useOrgSid}) AS guidedPrice,
@@ -757,7 +759,8 @@
         DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate,
         bv.costPrice as priced,
         bv.insideCode,
-        (select count(*) from base_vehicle bvv where bvv.insideCode = bv.insideCode and (bvv.vehicleStateValue = '库存' or bvv.vehicleStateValue = '调入')) as vehicleNum,
+        (select count(*) from base_vehicle bvv where bvv.insideCode = bv.insideCode and (bvv.vehicleStateValue = '库存' or
+        bvv.vehicleStateValue = '调入')) as vehicleNum,
         (select datediff(now(),DATE_FORMAT(bv.priceDate,'%Y-%m-%d'))) as dayNum
 
         FROM base_vehicle bv
@@ -1029,6 +1032,7 @@
     <select id="selectByVinNoAndOrgSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
         SELECT *
         FROM base_vehicle
-        WHERE vinNo = #{vinNo} AND useOrgSid = #{useOrgSid}
+        WHERE vinNo = #{vinNo}
+          AND useOrgSid = #{useOrgSid}
     </select>
 </mapper>

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDetailedsVo.java

@@ -79,4 +79,10 @@ public class AppScmVehicleStayInventoryDetailedsVo implements Vo {
     @ApiModelProperty("见证材料")
     private List<String> images;
 
+    @ApiModelProperty("定位")
+    private String address;
+
+    @ApiModelProperty("定位经纬度")
+    private String addressCode;
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/AppScmVehicleStayPatrolinspectionPageQuery.java

@@ -11,7 +11,7 @@ public class AppScmVehicleStayPatrolinspectionPageQuery implements Query {
     private String userSid;
 
     @ApiModelProperty("优先匹配车架号 存放地点 巡检人员")
-    private String name;
+    private String names;
 
     @ApiModelProperty("存放地点 “”/null 全部 有值时只查询当前存放地点的记录")
     private String warehouseSid;

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml

@@ -58,6 +58,8 @@
                location          AS warehouse,
                inventoryName     AS `name`,
                InventoryStateKey AS state,
+               address,
+               addressCode,
                remarks
         FROM scm_vehicle_inventory
         where sid = #{recordSid}

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

@@ -76,7 +76,7 @@ public interface ScmVehicleStayPatrolinspectionMapper extends BaseMapper<ScmVehi
      * @param name
      * @return
      */
-    IPage<AppScmVehicleStayPatrolinspectionPageVo> getInventoryList(IPage<AppScmVehicleStayPatrolinspectionPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw, @Param("name") String name);
+    IPage<AppScmVehicleStayPatrolinspectionPageVo> getInventoryList(IPage<AppScmVehicleStayPatrolinspectionPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw, @Param("names") String names);
 
 
     void updateByStaySid(@Param("patrolInspectionSid") String patrolInspectionSid, @Param("newTime") String newTime, @Param("userName") String userName);

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

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

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

@@ -169,10 +169,10 @@ public class ScmVehicleStayPatrolinspectionService extends MybatisBaseService<Sc
         pagerQuery.getParams().setUseOrgSid(useOrgSid);
         QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw = appQueryWrapper(pagerQuery.getParams());
         AppScmVehicleStayPatrolinspectionPageQuery params = pagerQuery.getParams();
-        IPage<AppScmVehicleStayPatrolinspectionPageVo> iPage = baseMapper.getInventoryList(page, qw, params.getName());
+        IPage<AppScmVehicleStayPatrolinspectionPageVo> iPage = baseMapper.getInventoryList(page, qw, params.getNames());
         List<AppScmVehicleStayPatrolinspectionPageVo> records = iPage.getRecords();
         for (AppScmVehicleStayPatrolinspectionPageVo record : records) {
-            List<ScmVehicleStayPatrolinspectionVo> scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(record.getVin(), record.getId(),useOrgSid);
+            List<ScmVehicleStayPatrolinspectionVo> scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(record.getVin(), record.getId(), useOrgSid);
 
             if (scmVehicleStayPatrolinspectionVos.size() <= 0) {
                 record.setInspectionDate("无");
@@ -220,7 +220,7 @@ public class ScmVehicleStayPatrolinspectionService extends MybatisBaseService<Sc
     }
 
     public void updateByState(String patrolInspectionSid, int i) {
-        baseMapper.updateByState(patrolInspectionSid,i);
+        baseMapper.updateByState(patrolInspectionSid, i);
     }
 
     public void updateState(String stayInspSid) {

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

@@ -11,7 +11,7 @@ public class StayPatrolinspectionPageQuery implements Query {
     private String userSid;
 
     @ApiModelProperty("优先匹配车架号 存放地点 巡检人员")
-    private String name;
+    private String names;
 
     @ApiModelProperty("存放地点 “”/null 全部 有值时只查询当前存放地点的记录")
     private String warehouseSid;