From 4368795d5b268e460d312ab4f05074e633ad3dae Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Tue, 30 May 2023 16:56:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=8E=86=E5=8F=B2=E7=85=A7=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/BasicdataVehicleEntity.java | 50 +++++++++---------- .../BasicdataVehicleController.java | 2 + .../mapper/BasicdataVehicleMapper.xml | 4 +- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java index 439e5b5ab..437d87919 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java +++ b/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; } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java index 01cca302b..0a48c4276 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java +++ b/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 urls =basicdataVehicleService.selectPhotoBymasterId(basicdataVehicleVO.getId()); + log.info("urls>>>>>{}",urls); if (urls.size()>0){basicdataVehicleVO.setHistoricPhotos(StringUtils.join(urls, ","));} return R.data(basicdataVehicleVO); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml index 62dfd402d..0d408f0e8 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml +++ b/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 From 48de08de0451ff01d24ac49fd267c114df063bdf Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 30 May 2023 17:42:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=E5=A4=84=E7=90=86=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E6=95=B0=E6=8D=AEserviceNum=E4=B8=BA=E7=A9=BA=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oldproject/service/impl/ServiceNumServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/ServiceNumServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/ServiceNumServiceImpl.java index a10bb40c1..6a6af20e6 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/ServiceNumServiceImpl.java +++ b/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 serviceNum) { - return serviceNumMapper.addAll(serviceNum); + if(!Objects.isNull(serviceNum)&&serviceNum.size()>0){ + return serviceNumMapper.addAll(serviceNum); + } + return true; } } From 88b525a4861198b16ff888bc29d04da766eb0fda Mon Sep 17 00:00:00 2001 From: kilo Date: Tue, 30 May 2023 18:09:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/controller/BasicdataWarehouseController.java | 1 + .../com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java index 74f382214..4517ad8f8 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java +++ b/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 ids) { boolean result = warehouseService.removeWarehouse(ids); + return R.status(result); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml index 471a5f400..7b8ec2be8 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml +++ b/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}