From ccab9a4fe3204fd4a010d6b5626d1312a0c46178 Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Wed, 17 Jul 2024 10:44:30 +0800 Subject: [PATCH 1/8] =?UTF-8?q?sql=20=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InspectionPlanController.java | 10 ++-------- .../controller/InspectionRouteController.java | 10 ++-------- .../modules/inspection/mapper/InspectionPlanMapper.xml | 10 +++++----- .../inspection/mapper/InspectionRouteMapper.xml | 10 +++++----- 4 files changed, 14 insertions(+), 26 deletions(-) diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java index 9c08b2b..15a2c64 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java @@ -144,7 +144,7 @@ public class InspectionPlanController extends DafController { public R submit(@Valid @RequestBody InspectionPlan inspectionPlan) { inspectionPlan.setPlanStatus(1); String date = LocalDate.now().toString().replace("-",""); - String maxNo = inspectionPlanService.getMaxNo("'%" + date + "%'"); + String maxNo = inspectionPlanService.getMaxNo(date); int number; if (StringUtil.isNotEmpty(maxNo)){ number = Integer.parseInt(maxNo.substring(9)); @@ -216,12 +216,6 @@ public class InspectionPlanController extends DafController { @ApiLog public void exportInspectionRoute(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { entity.remove("daf-auth"); - entity.forEach((key, value) -> { - if (!"station".equals(key) && !"planStatus".equals(key)) - { - entity.put(key, "%" + value + "%"); - } - }); InspectionPlan vo = DataUtils.mapToEntity(entity, InspectionPlan::new); List list = inspectionPlanService.export(vo); response.setContentType("application/vnd.ms-excel"); @@ -249,7 +243,7 @@ public class InspectionPlanController extends DafController { @ApiOperationSupport(order = 12) @ApiOperation(value = "获取路线信息", notes = "获取路线信息") public R getDetail(String planNo) { - InspectionPlan detail = inspectionPlanService.getDetail("'" + planNo + "'"); + InspectionPlan detail = inspectionPlanService.getDetail(planNo); return R.data(detail); } } diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java index 0a24905..9847cad 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java @@ -144,7 +144,7 @@ public class InspectionRouteController extends DafController { public R submit(@Valid @RequestBody InspectionRoute inspectionRoute) { inspectionRoute.setIstatus(1); String date = LocalDate.now().toString().replace("-",""); - String maxNo = inspectionRouteService.getMaxNo("'%" + date + "%'"); + String maxNo = inspectionRouteService.getMaxNo(date); int number; if (StringUtil.isNotEmpty(maxNo)){ number = Integer.parseInt(maxNo.substring(9)); @@ -217,12 +217,6 @@ public class InspectionRouteController extends DafController { @ApiLog public void exportInspectionRoute(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { entity.remove("daf-auth"); - entity.forEach((key, value) -> { - if (!"stations".equals(key) && !"istatus".equals(key)) - { - entity.put(key, "%" + value + "%"); - } - }); InspectionRoute vo = DataUtils.mapToEntity(entity, InspectionRoute::new); List list = inspectionRouteService.export(vo); response.setContentType("application/vnd.ms-excel"); @@ -250,7 +244,7 @@ public class InspectionRouteController extends DafController { @ApiOperationSupport(order = 12) @ApiOperation(value = "获取路线信息", notes = "获取路线信息") public R getDetailList(String routeNo) { - InspectionRoute DetailList = inspectionRouteService.getDetailList("'" + routeNo + "'"); + InspectionRoute DetailList = inspectionRouteService.getDetailList(routeNo); return R.data(DetailList); } diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml index cc148a8..5ffb0ae 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml @@ -36,16 +36,16 @@ LEFT JOIN sys_dict dic2 ON dic2.code = 'istatus' AND dic2.dict_key = a.plan_status AND dic2.is_deleted = '0' WHERE a.is_deleted = 0 - AND a.plan_no LIKE #{entity.planNo} + AND a.plan_no LIKE CONCAT('%', #{entity.planNo}, '%') - AND a.plan_name LIKE #{entity.planName} + AND a.plan_name LIKE CONCAT('%', #{entity.planName}, '%') AND a.station = #{entity.station} - AND a.period_type LIKE #{entity.periodType} + AND a.period_type LIKE CONCAT('%', #{entity.periodType}, '%') AND a.plan_status = #{entity.planStatus} @@ -58,11 +58,11 @@ diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml index 402eff3..b5fc70d 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml @@ -33,16 +33,16 @@ LEFT JOIN sys_dict dic2 ON dic2.code = 'istatus' AND dic2.dict_key = a.istatus AND dic2.is_deleted = '0' WHERE a.is_deleted = 0 - AND a.route_no LIKE #{entity.routeNo} + AND a.route_no LIKE CONCAT('%', #{entity.routeNo}, '%') - AND a.route_name LIKE #{entity.routeName} + AND a.route_name LIKE CONCAT('%', #{entity.routeName}, '%') AND a.stations = #{entity.stations} - AND a.type LIKE #{entity.type} + AND a.type LIKE CONCAT('%', #{entity.type}, '%') AND a.istatus = #{entity.istatus} @@ -55,11 +55,11 @@ From 06df1d313c7e5be5833486870368d002fc18888d Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Wed, 17 Jul 2024 10:58:19 +0800 Subject: [PATCH 2/8] =?UTF-8?q?sql=20=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InspectionPlanController.java | 10 ++-------- .../controller/InspectionRouteController.java | 10 ++-------- .../controller/InspectionTasksController.java | 8 +------- .../inspection/mapper/InspectionTasksMapper.xml | 12 ++++++------ 4 files changed, 11 insertions(+), 29 deletions(-) diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java index a330d47..3cddf13 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java @@ -141,7 +141,7 @@ public class InspectionPlanController extends DafController { public R submit(@Valid @RequestBody InspectionPlan inspectionPlan) { inspectionPlan.setPlanStatus(1); String date = LocalDate.now().toString().replace("-",""); - String maxNo = inspectionPlanService.getMaxNo("'%" + date + "%'"); + String maxNo = inspectionPlanService.getMaxNo(date); int number; if (StringUtil.isNotEmpty(maxNo)){ number = Integer.parseInt(maxNo.substring(9)); @@ -213,12 +213,6 @@ public class InspectionPlanController extends DafController { @ApiLog public void exportInspectionRoute(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { entity.remove("daf-auth"); - entity.forEach((key, value) -> { - if (!"planStatus".equals(key)) - { - entity.put(key, "%" + value + "%"); - } - }); InspectionPlan vo = DataUtils.mapToEntity(entity, InspectionPlan::new); List list = inspectionPlanService.export(vo); response.setContentType("application/vnd.ms-excel"); @@ -246,7 +240,7 @@ public class InspectionPlanController extends DafController { @ApiOperationSupport(order = 12) @ApiOperation(value = "获取路线信息", notes = "获取路线信息") public R getDetail(String planNo) { - InspectionPlan detail = inspectionPlanService.getDetail("'" + planNo + "'"); + InspectionPlan detail = inspectionPlanService.getDetail(planNo); return R.data(detail); } } diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java index 86532af..639c344 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java @@ -141,7 +141,7 @@ public class InspectionRouteController extends DafController { public R submit(@Valid @RequestBody InspectionRoute inspectionRoute) { inspectionRoute.setIstatus(1); String date = LocalDate.now().toString().replace("-",""); - String maxNo = inspectionRouteService.getMaxNo("'%" + date + "%'"); + String maxNo = inspectionRouteService.getMaxNo(date); int number; if (StringUtil.isNotEmpty(maxNo)){ number = Integer.parseInt(maxNo.substring(9)); @@ -214,12 +214,6 @@ public class InspectionRouteController extends DafController { @ApiLog public void exportInspectionRoute(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { entity.remove("daf-auth"); - entity.forEach((key, value) -> { - if (!"istatus".equals(key)) - { - entity.put(key, "%" + value + "%"); - } - }); InspectionRoute vo = DataUtils.mapToEntity(entity, InspectionRoute::new); List list = inspectionRouteService.export(vo); response.setContentType("application/vnd.ms-excel"); @@ -247,7 +241,7 @@ public class InspectionRouteController extends DafController { @ApiOperationSupport(order = 12) @ApiOperation(value = "获取路线信息", notes = "获取路线信息") public R getDetailList(String routeNo) { - InspectionRoute DetailList = inspectionRouteService.getDetailList("'" + routeNo + "'"); + InspectionRoute DetailList = inspectionRouteService.getDetailList(routeNo); return R.data(DetailList); } diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java index 532baae..85a05db 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java @@ -162,7 +162,7 @@ public class InspectionTasksController extends DafController { public R submit(@Valid @RequestBody InspectionTasks inspectionTasks) { inspectionTasks.setTaskStatus(1L); String date = LocalDate.now().toString().replace("-",""); - String maxTaskNo = inspectionTasksService.getMaxTaskNo("'%" + date + "%'"); + String maxTaskNo = inspectionTasksService.getMaxTaskNo(date); int number; if (StringUtil.isNotEmpty(maxTaskNo)){ number = Integer.parseInt(maxTaskNo.substring(9)); @@ -232,12 +232,6 @@ public class InspectionTasksController extends DafController { @ApiLog public void exportUser(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { entity.remove("daf-auth"); - entity.forEach((key, value) -> { - if (!"station".equals(key) && !"taskStatus".equals(key)) - { - entity.put(key, "%" + value + "%"); - } - }); InspectionTasks vo = DataUtils.mapToEntity(entity, InspectionTasks::new); List list = inspectionTasksService.export(vo); response.setContentType("application/vnd.ms-excel"); diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml index 4fdad89..f860d53 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml @@ -44,22 +44,22 @@ LEFT JOIN sys_dict dic2 ON dic2.code = 'task_status' AND dic2.dict_key = a.task_status AND dic2.is_deleted = '0' WHERE a.is_deleted = 0 - AND a.task_no LIKE #{entity.taskNo} + AND a.task_no LIKE CONCAT('%', #{entity.taskNo}, '%') - AND a.task_name LIKE #{entity.taskName} + AND a.task_name LIKE CONCAT('%', #{entity.taskName}, '%') AND a.station = #{entity.station} - AND a.task_start_date LIKE #{entity.taskStartDate} + AND a.task_start_date LIKE CONCAT('%', #{entity.taskStartDate}, '%') - AND a.task_end_date LIKE #{entity.taskEndDate} + AND a.task_end_date LIKE CONCAT('%', #{entity.taskEndDate}, '%') - AND a.responsible_person LIKE #{entity.responsiblePerson} + AND a.responsible_person LIKE CONCAT('%', #{entity.responsiblePerson}, '%') AND a.task_status = #{entity.taskStatus} @@ -68,7 +68,7 @@ From cec9a2725b3ca250dbf1b00636c38e668ec24518 Mon Sep 17 00:00:00 2001 From: liuyiliang Date: Wed, 17 Jul 2024 11:13:21 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WarehouseController.java | 20 +++++++++++++++++++ .../energy/modules/system/util/DataUtils.java | 17 ++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/src/main/java/org/energy/modules/spares/controller/WarehouseController.java b/src/main/java/org/energy/modules/spares/controller/WarehouseController.java index c34bf84..40464c1 100644 --- a/src/main/java/org/energy/modules/spares/controller/WarehouseController.java +++ b/src/main/java/org/energy/modules/spares/controller/WarehouseController.java @@ -140,6 +140,26 @@ public class WarehouseController extends DafController { @ApiOperationSupport(order = 6) @ApiOperation(value = "新增或修改", notes = "传入warehouse") public R submit(@Valid @RequestBody Warehouse warehouse) { + if (warehouse.getId() == null) { + QueryWrapper qw = new QueryWrapper<>(); + qw.lambda().select(Warehouse::getCode) + .eq(Warehouse::getType, warehouse.getType()) + .eq(Warehouse::getIsDeleted, DafConstant.DB_NOT_DELETED) + .orderByDesc(Warehouse::getCode) + .last("LIMIT 1"); + String code = ""; + Warehouse warehouseSelect = warehouseService.getOne(qw); + if (warehouseSelect != null) { + String maxCode = warehouseSelect.getCode(); + if ("9999".equals(maxCode)) { + return R.fail("操作失败，编号已越位"); + } + code = "CK" + warehouse.getType() + DataUtils.incrementLast(maxCode, 4); + } else { + code = "CK" + warehouse.getType() + "0001"; + } + warehouse.setCode(code); + } return R.status(warehouseService.saveOrUpdate(warehouse)); } diff --git a/src/main/java/org/energy/modules/system/util/DataUtils.java b/src/main/java/org/energy/modules/system/util/DataUtils.java index 2d1babd..2e49591 100644 --- a/src/main/java/org/energy/modules/system/util/DataUtils.java +++ b/src/main/java/org/energy/modules/system/util/DataUtils.java @@ -68,4 +68,21 @@ public class DataUtils { // Add more type conversions as needed return value; } + + /** + * 将字符串末尾的latterIndex位数字加一并格式化成latterIndex位数 + * @param str + * @return + */ + public static String incrementLast(String str, int latterIndex) { + // 获取字符串末尾的latterIndex位字符 + String lastFour = str.substring(Math.max(0, str.length() - latterIndex)); + // 将末尾字符转换为整数 + int number = Integer.parseInt(lastFour); + // 整数加一 + number++; + // 格式化整数为latterIndex位数的字符串 + String result = String.format("%0" + latterIndex + "d", number); + return result; + } } From a3f861a00a441845feed8339a09b6b1941a96561 Mon Sep 17 00:00:00 2001 From: liuyiliang Date: Wed, 17 Jul 2024 11:37:32 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/spares/entity/ManufacturerInfo.java | 14 +++++++++----- .../energy/modules/spares/entity/SupplierInfo.java | 9 +++++++-- .../spares/excel/ManufacturerInfoExcel.java | 8 ++++++++ .../modules/spares/excel/SupplierInfoExcel.java | 10 +++++++++- .../spares/mapper/ManufacturerInfoMapper.xml | 4 +++- .../modules/spares/mapper/SupplierInfoMapper.xml | 4 +++- 6 files changed, 39 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/energy/modules/spares/entity/ManufacturerInfo.java b/src/main/java/org/energy/modules/spares/entity/ManufacturerInfo.java index 5c2f52c..fcbcb9f 100644 --- a/src/main/java/org/energy/modules/spares/entity/ManufacturerInfo.java +++ b/src/main/java/org/energy/modules/spares/entity/ManufacturerInfo.java @@ -65,12 +65,16 @@ public class ManufacturerInfo extends BaseEntity { */ @ApiModelProperty(value = "经营范围") private String businessScope; - /** - * 执行标准 - */ + /** + * 审核状态 + */ @JsonSerialize(nullsUsing = NullSerializer.class) - @ApiModelProperty(value = "执行标准") + @ApiModelProperty(value = "审核状态") private Integer approvalStatus; - + /** + * 执行标准 + */ + @ApiModelProperty(value = "执行标准") + private String executiveStandards; } diff --git a/src/main/java/org/energy/modules/spares/entity/SupplierInfo.java b/src/main/java/org/energy/modules/spares/entity/SupplierInfo.java index 753abff..2a18d79 100644 --- a/src/main/java/org/energy/modules/spares/entity/SupplierInfo.java +++ b/src/main/java/org/energy/modules/spares/entity/SupplierInfo.java @@ -66,10 +66,10 @@ public class SupplierInfo extends BaseEntity { @ApiModelProperty(value = "经营范围") private String businessScope; /** - * 执行标准 + * 审核状态 */ @JsonSerialize(nullsUsing = NullSerializer.class) - @ApiModelProperty(value = "执行标准") + @ApiModelProperty(value = "审核状态") private Integer approvalStatus; /** * 付款条约 @@ -81,6 +81,11 @@ public class SupplierInfo extends BaseEntity { */ @ApiModelProperty(value = "价格条款") private String priceTerms; + /** + * 执行标准 + */ + @ApiModelProperty(value = "执行标准") + private String executiveStandards; } diff --git a/src/main/java/org/energy/modules/spares/excel/ManufacturerInfoExcel.java b/src/main/java/org/energy/modules/spares/excel/ManufacturerInfoExcel.java index 51ee610..b62a737 100644 --- a/src/main/java/org/energy/modules/spares/excel/ManufacturerInfoExcel.java +++ b/src/main/java/org/energy/modules/spares/excel/ManufacturerInfoExcel.java @@ -85,6 +85,14 @@ public class ManufacturerInfoExcel implements Serializable { @JsonSerialize(nullsUsing = NullSerializer.class) @ColumnWidth(20) @ExcelProperty(value = "执行标准") + private String executiveStandards; + + /** + * 审核状态 + */ + @JsonSerialize(nullsUsing = NullSerializer.class) + @ColumnWidth(20) + @ExcelProperty(value = "审核状态") private String approvalStatus; } diff --git a/src/main/java/org/energy/modules/spares/excel/SupplierInfoExcel.java b/src/main/java/org/energy/modules/spares/excel/SupplierInfoExcel.java index 4c00fa6..8b062a3 100644 --- a/src/main/java/org/energy/modules/spares/excel/SupplierInfoExcel.java +++ b/src/main/java/org/energy/modules/spares/excel/SupplierInfoExcel.java @@ -82,7 +82,7 @@ public class SupplierInfoExcel implements Serializable { @JsonSerialize(nullsUsing = NullSerializer.class) @ColumnWidth(20) @ExcelProperty(value = "执行标准") - private String approvalStatus; + private String executiveStandards; /** * 付款条约 */ @@ -96,4 +96,12 @@ public class SupplierInfoExcel implements Serializable { @ExcelProperty(value = "价格条款") private String priceTerms; + /** + * 审核状态 + */ + @JsonSerialize(nullsUsing = NullSerializer.class) + @ColumnWidth(20) + @ExcelProperty(value = "审核状态") + private String approvalStatus; + } diff --git a/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.xml b/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.xml index 0790f0e..ed03a5c 100644 --- a/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.xml +++ b/src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.xml @@ -16,6 +16,7 @@ + @@ -36,7 +37,8 @@ a.contact_number, a.email, a.business_scope, - a.approval_status + a.approval_status, + a.executive_standards from spt_manufacturer_info a where a.is_deleted = 0 diff --git a/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.xml b/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.xml index a480ce3..7daf699 100644 --- a/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.xml +++ b/src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.xml @@ -19,6 +19,7 @@ + @@ -39,7 +40,8 @@ a.business_scope, a.approval_status, a.payment_terms, - a.price_terms + a.price_terms, + a.executive_standards from spt_supplier_info a where a.is_deleted = 0 From 59f8cda331688a19bde17312474a9f8c703cf602 Mon Sep 17 00:00:00 2001 From: weitingdong <2480899115@qq.com> Date: Wed, 17 Jul 2024 14:43:09 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=20=E5=B7=A1=E6=A3=80=E5=AF=B9=E8=B1=A1=20bug=E5=AF=B9?= =?UTF-8?q?=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/entity/InspectionObject.java | 11 +++++-- .../excel/InspectionObjectExcel.java | 4 +++ .../mapper/InspectionObjectMapper.xml | 2 ++ .../ToolInventoryRecordController.java | 31 +++++++++++++------ .../mapper/ToolInventoryRecordMapper.java | 9 ++++++ .../mapper/ToolInventoryRecordMapper.xml | 8 +++++ .../service/IToolInventoryRecordService.java | 9 ++++++ .../impl/TechParametersServiceImpl.java | 1 + .../impl/ToolInventoryRecordServiceImpl.java | 12 +++++++ .../modules/smart/entity/WorkPermit.java | 3 ++ 10 files changed, 79 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/energy/modules/inspection/entity/InspectionObject.java b/src/main/java/org/energy/modules/inspection/entity/InspectionObject.java index b223837..28891e0 100644 --- a/src/main/java/org/energy/modules/inspection/entity/InspectionObject.java +++ b/src/main/java/org/energy/modules/inspection/entity/InspectionObject.java @@ -61,11 +61,18 @@ public class InspectionObject extends BaseEntity { */ @ApiModelProperty(value = "对象区域") private String objectArea; + + /** + * KKS编号 + */ + @ApiModelProperty(value = "KKS编号") + private String kksNo; + /** * KKS编号 */ - @ApiModelProperty(value = "KKS编号") - private String kksNo; + @ApiModelProperty(value = "工器具编号") + private String toolsCodeId; /** * 取消原因 */ diff --git a/src/main/java/org/energy/modules/inspection/excel/InspectionObjectExcel.java b/src/main/java/org/energy/modules/inspection/excel/InspectionObjectExcel.java index a6830a0..b4f2129 100644 --- a/src/main/java/org/energy/modules/inspection/excel/InspectionObjectExcel.java +++ b/src/main/java/org/energy/modules/inspection/excel/InspectionObjectExcel.java @@ -43,6 +43,10 @@ public class InspectionObjectExcel implements Serializable { @ExcelProperty(value = "KKS编号") private String kksNo; + @ColumnWidth(15) + @ExcelProperty(value = "工器具台账编码") + private String toolsCodeId; + @ColumnWidth(15) @ExcelProperty(value = "取消原因") private String cancelReason; diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionObjectMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionObjectMapper.xml index 7aa1e8d..f14bfa2 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionObjectMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionObjectMapper.xml @@ -18,6 +18,7 @@ + @@ -58,6 +59,7 @@ THEN '巡检对象02' ELSE '' END AS object_name_ext + , tools_code_id FROM i_inspection_object ${ew.customSqlSegment} diff --git a/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java b/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java index d19206e..15f3528 100644 --- a/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java +++ b/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java @@ -33,6 +33,7 @@ import com.dayu.daf.core.mp.support.Condition; import com.dayu.daf.core.mp.support.Query; import com.dayu.daf.core.tool.api.R; import com.dayu.daf.core.tool.utils.Func; +import org.energy.modules.leger.entity.EquipmentLedger; import org.energy.modules.leger.entity.TechParameters; import org.energy.modules.leger.excel.ToolInventoryRecordExcel; import org.energy.modules.leger.service.*; @@ -221,14 +222,26 @@ public class ToolInventoryRecordController extends DafController { EasyExcel.write(response.getOutputStream(), ToolInventoryRecordExcel.class).sheet("工器具台账").doWrite(list); } -// /** -// * 删除 检验标准一览 -// */ -// @GetMapping("/del") -// @ApiOperationSupport(order = 9) -// @ApiOperation(value = "逻辑删除", notes = "传入eqLedgerId") -// public R del(@ApiParam(value = "主键集合", required = true) @RequestParam Integer eqLedgerId) { -// return R.status(toolInventoryRecordService.delTechParameters(eqLedgerId)); -// } + /** + * 获取对象编号 + */ + @GetMapping("/getToolsCodeIdList") + @ApiOperationSupport(order = 11) + @ApiOperation(value = "获取工器具编码", notes = "获取工器具编码") + public R> getToolsCodeIdList() { + List kksList = toolInventoryRecordService.getToolsCodeIdList(); + return R.data(kksList); + } + + /** + * 获取对象编号 + */ + @GetMapping("/getDetailList") + @ApiOperationSupport(order = 12) + @ApiOperation(value = "获取工器具信息", notes = "获取工器具信息") + public R getDetailList(String toolsCodeId) { + ToolInventoryRecord DetailList = toolInventoryRecordService.getDetailList("'" + toolsCodeId + "'"); + return R.data(DetailList); + } } diff --git a/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.java b/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.java index d82dbb4..5e21bc8 100644 --- a/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.java +++ b/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.java @@ -30,4 +30,13 @@ public interface ToolInventoryRecordMapper extends BaseMapper exportData(@Param("ew") Wrapper queryWrapper); + /** + * 获取kks编号 + */ + List getToolsCodeIdList(); + /** + * 获取kks的信息 + */ + ToolInventoryRecord getDetailList(String toolsCodeId); + } diff --git a/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml b/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml index cb0447f..60a7800 100644 --- a/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml +++ b/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml @@ -66,4 +66,12 @@ END AS check_status_ext FROM l_tool_inventory_record ${ew.customSqlSegment} + + + + diff --git a/src/main/java/org/energy/modules/leger/service/IToolInventoryRecordService.java b/src/main/java/org/energy/modules/leger/service/IToolInventoryRecordService.java index eb44cac..1b1b343 100644 --- a/src/main/java/org/energy/modules/leger/service/IToolInventoryRecordService.java +++ b/src/main/java/org/energy/modules/leger/service/IToolInventoryRecordService.java @@ -36,4 +36,13 @@ public interface IToolInventoryRecordService extends BaseService export(Wrapper queryWrapper); + /** + * 获取路线编号 + */ + List getToolsCodeIdList(); + /** + * 获取路线的信息 + */ + ToolInventoryRecord getDetailList(String toolsCodeId); + } diff --git a/src/main/java/org/energy/modules/leger/service/impl/TechParametersServiceImpl.java b/src/main/java/org/energy/modules/leger/service/impl/TechParametersServiceImpl.java index b1459e4..69afb83 100644 --- a/src/main/java/org/energy/modules/leger/service/impl/TechParametersServiceImpl.java +++ b/src/main/java/org/energy/modules/leger/service/impl/TechParametersServiceImpl.java @@ -26,4 +26,5 @@ public class TechParametersServiceImpl extends BaseServiceImpl getToolsCodeIdList() { + List list = baseMapper.getToolsCodeIdList(); + return list; + } + + @Override + public ToolInventoryRecord getDetailList(String toolsCodeId) { + ToolInventoryRecord DetailList = baseMapper.getDetailList(toolsCodeId); + return DetailList; + } + } diff --git a/src/main/java/org/energy/modules/smart/entity/WorkPermit.java b/src/main/java/org/energy/modules/smart/entity/WorkPermit.java index 4bfbfbb..43b03f6 100644 --- a/src/main/java/org/energy/modules/smart/entity/WorkPermit.java +++ b/src/main/java/org/energy/modules/smart/entity/WorkPermit.java @@ -5,6 +5,7 @@ import com.dayu.daf.core.mp.base.BaseEntity; import java.io.Serializable; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.EqualsAndHashCode; @@ -126,6 +127,7 @@ public class WorkPermit extends BaseEntity { /** * 是否延期 */ + @JsonSerialize(nullsUsing = NullSerializer.class) @ApiModelProperty(value = "是否延期") private Integer isExtended; /** @@ -141,6 +143,7 @@ public class WorkPermit extends BaseEntity { /** * 是否变更 */ + @JsonSerialize(nullsUsing = NullSerializer.class) @ApiModelProperty(value = "是否变更") private Integer ischanged; /** From 3e0344a64c5beadd433a5db2967d9c3d6ff480e7 Mon Sep 17 00:00:00 2001 From: weitingdong <2480899115@qq.com> Date: Wed, 17 Jul 2024 14:58:36 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E5=AF=B9=E8=B1=A1=20bug?= =?UTF-8?q?=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/energy/modules/inspection/entity/InspectionObject.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/energy/modules/inspection/entity/InspectionObject.java b/src/main/java/org/energy/modules/inspection/entity/InspectionObject.java index 28891e0..32d97bd 100644 --- a/src/main/java/org/energy/modules/inspection/entity/InspectionObject.java +++ b/src/main/java/org/energy/modules/inspection/entity/InspectionObject.java @@ -40,7 +40,7 @@ public class InspectionObject extends BaseEntity { * 对象名称 */ @ApiModelProperty(value = "对象名称") - private Integer objectName; + private String objectName; /** * 场站 */ From 768a0481d17df43543fe15416eb0683df0ab32f4 Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Wed, 17 Jul 2024 16:04:49 +0800 Subject: [PATCH 8/8] =?UTF-8?q?BUG=20=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/spares/mapper/MaterialMapper.xml | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml b/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml index 1013526..ac128a7 100644 --- a/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml +++ b/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml @@ -38,18 +38,16 @@