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

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java

@@ -282,30 +282,30 @@ public class BasicdataVehicleEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "GPS型号")
 	private String gpsModel;
-//	/**
-//	 * 预留1
-//	 */
-//	@ApiModelProperty(value = "预留1")
-//	private String reserve1;
-//	/**
-//	 * 预留2
-//	 */
-//	@ApiModelProperty(value = "预留2")
-//	private String reserve2;
-//	/**
-//	 * 预留3
-//	 */
-//	@ApiModelProperty(value = "预留3")
-//	private String reserve3;
-//	/**
-//	 * 预留4
-//	 */
-//	@ApiModelProperty(value = "预留4")
-//	private String reserve4;
-//	/**
-//	 * 预留5
-//	 */
-//	@ApiModelProperty(value = "预留5")
-//	private String reserve5;
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java

@@ -29,6 +29,7 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -81,6 +82,7 @@ public class BasicdataVehicleController extends BladeController {
 		BasicdataVehicleVO basicdataVehicleVO = new BasicdataVehicleVO();
 		BeanUtils.copyProperties(detail,basicdataVehicleVO);
 		List<String> urls =basicdataVehicleService.selectPhotoBymasterId(basicdataVehicleVO.getId());
+		log.info("urls>>>>>{}",urls);
 		if (urls.size()>0){basicdataVehicleVO.setHistoricPhotos(StringUtils.join(urls, ","));}
 		return R.data(basicdataVehicleVO);
 	}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java

@@ -153,6 +153,7 @@ public class BasicdataWarehouseController extends BladeController {
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam List<String> ids) {
 		boolean result = warehouseService.removeWarehouse(ids);
+
 		return R.status(result);
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml

@@ -131,7 +131,7 @@
         lbv.gps_model gpsModel,
         (
         SELECT
-        lbvp.photo_url
+        group_concat(lbvp.photo_url)
         FROM
         logpm_basicdata_vehicle_photo lbvp
         where
@@ -139,7 +139,7 @@
         AND lbvp.create_time <= DATE_SUB( CURDATE(), INTERVAL 1 YEAR )
         ORDER BY
         lbvp.create_time
-        LIMIT 1
+        LIMIT 3
         ) historicPhotos
         FROM
         logpm_basicdata_vehicle lbv

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml

@@ -51,8 +51,8 @@
         UPDATE logpm_warehouse_warehouse
         SET is_deleted = 1
         WHERE
-            NOT EXISTS ( SELECT b.id FROM logpm_warehouse_goods_area b WHERE b.warehouse_id = #{id} )
-            AND NOT EXISTS (SELECT f.id FROM logpm_basic_team_group f WHERE f.belong_to=#{id})
+            NOT EXISTS ( SELECT b.id FROM logpm_warehouse_goods_area b WHERE b.warehouse_id = #{id} AND b.is_deleted = 0)
+            AND NOT EXISTS (SELECT f.id FROM logpm_basic_team_group f WHERE f.belong_to=#{id} AND f.is_deleted = 0 )
             AND id = #{id}
     </update>
 

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/ServiceNumServiceImpl.java

@@ -23,6 +23,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 包内产品明细 服务实现类
@@ -38,6 +39,9 @@ public class ServiceNumServiceImpl implements IServiceNumService {
 
 	@Override
 	public Boolean addServiceNum(List<ServiceNumEntity> serviceNum) {
-		return serviceNumMapper.addAll(serviceNum);
+		if(!Objects.isNull(serviceNum)&&serviceNum.size()>0){
+			return serviceNumMapper.addAll(serviceNum);
+		}
+		return true;
 	}
 }