Merge remote-tracking branch 'origin/dev-chw' into dev-chw

ace-modules/ace-admin/src/main/resources/mapper/BranchCompanyMapper.xml

@@ -82,6 +82,7 @@
                 </foreach>
             </if>
         </where>
+        GROUP BY c.id
         <choose>
             <when test="lon != null and lat != null">
                 order by distance asc

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/Vehicle.java

@@ -325,4 +325,8 @@ public class  Vehicle {
     @ApiModelProperty("扩展信息list")
     private String extensionList;
 
+    @Transient
+    @ApiModelProperty("申请id")
+    private Integer vehicleApplyId;
+
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/VehicleExtensionVO.java

@@ -25,7 +25,7 @@ public class VehicleExtensionVO extends VehicleExtension {
     private  Integer isParentSelected;
 
     @ApiModelProperty("客户是否多选:0-否,1-是")
-    private  Integer isMore;
+    private  Integer isInputMore;
 
     public List<VehicleExtensionVO> children;
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleApplyBiz.java

@@ -45,10 +45,10 @@ public class VehicleApplyBiz extends BaseBiz<VehicleApplyMapper, VehicleApply>{
              throw  new BaseException("参数不能为空",ResultCode.FAILED_CODE);
         }
         String vehicleId=StringUtils.isBlank(vehicle.getId()) ? "" : vehicle.getId();
-        List<Vehicle> list=vehicleBiz.getListByExample(vehicleId,vehicle.getName());
+       /* List<Vehicle> list=vehicleBiz.getListByExample(vehicleId,vehicle.getName());
         if (list.size() > 0){
             throw  new BaseException("公司名称不能重复",ResultCode.FAILED_CODE);
-        }
+        }*/
         VehicleApply vehicleApply=new VehicleApply();
         BeanUtils.copyProperties(vehicle,vehicleApply);
         Integer formType=2;
@@ -69,6 +69,13 @@ public class VehicleApplyBiz extends BaseBiz<VehicleApplyMapper, VehicleApply>{
         vehicleApply.setVehicleId(vehicleId);
         vehicleApply.setId(null);
         insertSelective(vehicleApply);
+        Integer vehicleApplyId = vehicle.getVehicleApplyId() == null ? 0 : vehicle.getVehicleApplyId();
+        if (vehicleApplyId > 0){
+            VehicleApply vehicleApply1=new VehicleApply();
+            vehicleApply1.setId(vehicleApplyId);
+            vehicleApply1.setIsDel(1);
+            updateSelectiveById(vehicleApply1);
+        }
         return  vehicleApply;
     }
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -1609,10 +1609,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
 
     public String addOrUpd(VehicleApply vehicleApply){
         String vehicleId=StringUtils.isBlank(vehicleApply.getVehicleId()) ? "" : vehicleApply.getVehicleId();
-        List<Vehicle> list=getListByExample(vehicleId,vehicleApply.getName());
+       /* List<Vehicle> list=getListByExample(vehicleId,vehicleApply.getName());
         if (list.size() > 0){
             throw  new BaseException("公司名称不能重复", ResultCode.FAILED_CODE);
-        }
+        }*/
         Vehicle vehicle= JSONUtil.toBean(vehicleApply.getChangeJson(),Vehicle.class);
         if (StringUtils.isNotBlank(vehicleId)){
             vehicle.setExtensionList(null);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleExtensionBiz.java

@@ -116,8 +116,10 @@ public class VehicleExtensionBiz extends BaseBiz<VehicleEextensionMapper, Vehicl
         }else {
             VehicleApply vehicleApply = vehicleApplyBiz.selectById(extensionFindDTO.getVehicleApplyId());
             extensionFindDTO.setGoodsType(vehicleApply.getGoodsType());
+            if (StringUtils.isNotBlank(vehicleApply.getExtensionList())){
                 extensionFindDTO.setCataIds(Arrays.asList(vehicleApply.getExtensionList().split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList()));
             }
+        }
         extensionFindDTO.setParentId(0);
         List<VehicleExtensionVO> vehicleExtensionVOS = mapper.selectListByPlatCata(extensionFindDTO);
         if (vehicleExtensionVOS.size() > 0){

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleExtensionMapper.xml

@@ -87,15 +87,19 @@
         SELECT
             c.id,
             c.`name` as cataName,
-            c.`is_more` as isMore,
+            c.`is_input_more` as isInputMore,
             <choose>
                 <when test="vehicleId != null and vehicleId != ''">
                     IF(e.cata_id is NULL,0,1) as isSelected,
                     IF(e1.cata_id is NULL,0,1) as isParentSelected
                 </when>
+                <when test="cataIds != null and cataIds.size() > 0">
+                    IF(e.cata_id is NULL,0,1) as isSelected,
+                    IF(e1.cata_id is NULL,0,1) as isParentSelected
+                </when>
                 <otherwise>
-                    IF(c2.id  is NULL,0,1) as isSelected,
-                    IF(c1.parent_id  is NULL,0,1) as isParentSelected
+                   0 as isSelected,
+                   0 as isParentSelected
                 </otherwise>
             </choose>