Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml

@@ -25,7 +25,7 @@
         FROM
         base_vehmodel_config bvc
         WHERE bvm.`sid` = bvc.`modelSid`
-        AND bvm.`createOrg` = bvc.useOrgSid AND bvm.createOrg = #{createOrgSid}) AS relationConfigNum
+        AND bvc.useOrgSid = #{createOrgSid}) AS relationConfigNum
         FROM
         base_vehicle_model bvm
         LEFT JOIN base_vehicle_brand bvb

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionRest.java

@@ -166,7 +166,14 @@ public class AppSubsetVersionRest implements AppSubsetVersionFeign {
             appSubsetVersionOneDto.setModulePluginName("");
         }
         appSubsetVersionOneDto.setAppName(dto.getAppName());
-        appSubsetVersionOneDto.setIconUrl(dto.getIconUrl());
+        if (StringUtils.isNotBlank(dto.getIconUrl())) {
+            if (dto.getIconUrl().contains(fileUploadComponent.getUrlPrefix())) {
+                appSubsetVersionOneDto.setIconUrl(dto.getIconUrl().replace(fileUploadComponent.getUrlPrefix(), ""));
+            } else {
+                appSubsetVersionOneDto.setIconUrl(dto.getIconUrl());
+            }
+        }
+//        appSubsetVersionOneDto.setIconUrl(dto.getIconUrl());
         appSubsetVersionOneDto.setUpgradeInfo(dto.getUpgradeInfo());
         appSubsetVersionOneDto.setType(dto.getType());
         appSubsetVersionOneDto.setSourceAction(dto.getSourceAction());

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

@@ -63,7 +63,7 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper<ScmVehicleP
 
     List<ScmVehiclePatrolinspectionVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehiclePatrolinspection> qw);
 
-    @Select("select * from scm_vehicle_patrolinspection where useOrgSid = #{useOrgSid} AND id IN ( SELECT max( id ) id FROM scm_vehicle_patrolinspection GROUP BY vinNo ORDER BY id DESC )")
+    @Select("select * from scm_vehicle_patrolinspection where pushState = 0 and useOrgSid = #{useOrgSid} AND id IN ( SELECT max( id ) id FROM scm_vehicle_patrolinspection GROUP BY vinNo ORDER BY id DESC )")
     List<ScmVehiclePatrolinspectionVo> selectListVo(@Param("useOrgSid") String useOrgSid);
 
     /**

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

@@ -48,7 +48,7 @@
                (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.state = '1' and svp.mainSid = #{mainSid}) AS totalNumber,
                (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '001' and svp.mainSid = #{mainSid}) AS unHandledNumber,
                (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '002' and svp.mainSid = #{mainSid}) AS processedNumber,
-               (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.mainSid = #{mainSid}) AS notHandledNumber,
+               (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.isDelete = 0 and svp.mainSid = #{mainSid}) AS notHandledNumber,
                (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.mainSid = #{mainSid}) AS surplusNumber,
                (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '003' and svp.mainSid = #{mainSid}) AS normalNumber
         FROM scm_vehicle_patrolinspection svp

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java

@@ -430,7 +430,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
 
         StringBuilder question = new StringBuilder();
 
-        if (questions1.removeAll(Collections.singleton(null))) {
+        if (questions1.size() > 0) {
             for (AppVinAndRemarksVo remark : questions1) {
                 // 问题未解决
                 if (StringUtils.isNotBlank(remark.getVinNo())) {
@@ -444,7 +444,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
                 question.append("\n");
             }
         }
-        if (questions2.removeAll(Collections.singleton(null))) {
+        if (questions2.size() > 0) {
             for (AppVinAndRemarksVo remark : questions2) {
                 // 问题已解决
                 if (StringUtils.isNotBlank(remark.getVinNo())) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoDto.java

@@ -65,7 +65,7 @@ public class DisBaseInfoDto implements Dto {
     private String legalName;
 
     @ApiModelProperty(value = "身份证号码")
-    @NotBlank(message = "参数错误：身份证号码")
+//    @NotBlank(message = "参数错误：身份证号码")
     private String legalIdCard;
 
     @ApiModelProperty(value = "实际控制人联系电话")