From 0913b7bf6022558d277de8170ab63e413d0781a9 Mon Sep 17 00:00:00 2001 From: liuyiliang Date: Wed, 17 Jul 2024 19:28:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E3=80=81=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../smart/controller/WorkOrderController.java | 2 +- .../MaterialClassificationController.java | 2 +- .../spares/entity/MaterialClassification.java | 7 +- .../mapper/MaterialClassificationMapper.xml | 2 +- .../system/controller/RoleController.java | 11 ++ .../system/service/IRoleDataService.java | 29 ++++ .../service/impl/RoleDataServiceImpl.java | 131 ++++++++++++++++++ .../energy/modules/system/vo/HomePageVO.java | 32 +++++ 8 files changed, 209 insertions(+), 7 deletions(-) create mode 100644 src/main/java/org/energy/modules/system/service/IRoleDataService.java create mode 100644 src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java create mode 100644 src/main/java/org/energy/modules/system/vo/HomePageVO.java diff --git a/src/main/java/org/energy/modules/smart/controller/WorkOrderController.java b/src/main/java/org/energy/modules/smart/controller/WorkOrderController.java index 59be10f..e3371b5 100644 --- a/src/main/java/org/energy/modules/smart/controller/WorkOrderController.java +++ b/src/main/java/org/energy/modules/smart/controller/WorkOrderController.java @@ -130,7 +130,7 @@ public class WorkOrderController extends DafController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(workOrderService.deleteLogic(Func.toLongList(ids))); + return R.status(workOrderService.removeByIds(Func.toLongList(ids))); } /** diff --git a/src/main/java/org/energy/modules/spares/controller/MaterialClassificationController.java b/src/main/java/org/energy/modules/spares/controller/MaterialClassificationController.java index a9a3efb..d00f9bb 100644 --- a/src/main/java/org/energy/modules/spares/controller/MaterialClassificationController.java +++ b/src/main/java/org/energy/modules/spares/controller/MaterialClassificationController.java @@ -87,7 +87,7 @@ public class MaterialClassificationController extends DafController { qw.lambda().like(MaterialClassification::getCode, materialClassification.getCode()); } if (materialClassification.getType() != null) { - qw.lambda().eq(MaterialClassification::getType, materialClassification.getType()); + qw.lambda().like(MaterialClassification::getType, materialClassification.getType()); } qw.lambda().eq(MaterialClassification::getIsDeleted, DafConstant.DB_NOT_DELETED); qw.lambda().orderByDesc(MaterialClassification::getUpdateTime); diff --git a/src/main/java/org/energy/modules/spares/entity/MaterialClassification.java b/src/main/java/org/energy/modules/spares/entity/MaterialClassification.java index fa670e1..fb1e859 100644 --- a/src/main/java/org/energy/modules/spares/entity/MaterialClassification.java +++ b/src/main/java/org/energy/modules/spares/entity/MaterialClassification.java @@ -31,16 +31,15 @@ public class MaterialClassification extends BaseEntity { @ApiModelProperty(value = "主键") private Long id; /** - * 物资分配码 + * 物资分类码 */ - @ApiModelProperty(value = "物资分配码") + @ApiModelProperty(value = "物资分类码") private String code; /** * 物资类型 */ - @JsonSerialize(nullsUsing = NullSerializer.class) @ApiModelProperty(value = "物资类型") - private Integer type; + private String type; } diff --git a/src/main/java/org/energy/modules/spares/mapper/MaterialClassificationMapper.xml b/src/main/java/org/energy/modules/spares/mapper/MaterialClassificationMapper.xml index 8921849..ba22a3e 100644 --- a/src/main/java/org/energy/modules/spares/mapper/MaterialClassificationMapper.xml +++ b/src/main/java/org/energy/modules/spares/mapper/MaterialClassificationMapper.xml @@ -34,7 +34,7 @@ and a.code LIKE CONCAT('%', #{vo.code}, '%') - and a.type = #{vo.type} + and a.type LIKE CONCAT('%', #{vo.type}, '%') order by a.update_time desc diff --git a/src/main/java/org/energy/modules/system/controller/RoleController.java b/src/main/java/org/energy/modules/system/controller/RoleController.java index 7f3f404..2d3cc6d 100644 --- a/src/main/java/org/energy/modules/system/controller/RoleController.java +++ b/src/main/java/org/energy/modules/system/controller/RoleController.java @@ -29,8 +29,10 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.energy.modules.system.entity.Role; +import org.energy.modules.system.service.IRoleDataService; import org.energy.modules.system.service.IRoleService; import org.energy.modules.system.vo.GrantVO; +import org.energy.modules.system.vo.HomePageVO; import org.energy.modules.system.vo.RoleVO; import org.energy.modules.system.wrapper.RoleWrapper; import org.springframework.web.bind.annotation.*; @@ -56,6 +58,8 @@ public class RoleController extends DafController { private IRoleService roleService; + private IRoleDataService roleDataService; + /** * 详情 */ @@ -153,4 +157,11 @@ public class RoleController extends DafController { return R.status(temp); } + @GetMapping("/honePageData") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "首页数据", notes = "传入") + public R honePageData() { + return R.data(roleDataService.findCurrHomePageInfo()); + } + } diff --git a/src/main/java/org/energy/modules/system/service/IRoleDataService.java b/src/main/java/org/energy/modules/system/service/IRoleDataService.java new file mode 100644 index 0000000..5351ff9 --- /dev/null +++ b/src/main/java/org/energy/modules/system/service/IRoleDataService.java @@ -0,0 +1,29 @@ +/** + * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.energy.modules.system.service; + +import org.energy.modules.system.vo.HomePageVO; + +/** + * 服务类 + * + * @author DafX + */ +public interface IRoleDataService { + + HomePageVO findCurrHomePageInfo(); + +} diff --git a/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java b/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java new file mode 100644 index 0000000..94c11be --- /dev/null +++ b/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java @@ -0,0 +1,131 @@ +/** + * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.energy.modules.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.dayu.daf.core.tool.constant.DafConstant; +import org.energy.modules.leger.entity.EquipmentLedger; +import org.energy.modules.leger.entity.ToolInventoryRecord; +import org.energy.modules.leger.service.IEquipmentLedgerService; +import org.energy.modules.leger.service.IToolInventoryRecordService; +import org.energy.modules.smart.entity.OperationTicket; +import org.energy.modules.smart.entity.WorkOrder; +import org.energy.modules.smart.entity.WorkPermit; +import org.energy.modules.smart.service.IOperationTicketService; +import org.energy.modules.smart.service.IWorkOrderService; +import org.energy.modules.smart.service.IWorkPermitService; +import org.energy.modules.spares.entity.ManufacturerInfo; +import org.energy.modules.spares.entity.Material; +import org.energy.modules.spares.entity.SupplierInfo; +import org.energy.modules.spares.entity.Warehouse; +import org.energy.modules.spares.service.IManufacturerInfoService; +import org.energy.modules.spares.service.IMaterialService; +import org.energy.modules.spares.service.ISupplierInfoService; +import org.energy.modules.spares.service.IWarehouseService; +import org.energy.modules.system.service.IRoleDataService; +import org.energy.modules.system.vo.HomePageVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * 服务实现类 + * + * @author DafX + */ +@Service +public class RoleDataServiceImpl implements IRoleDataService { + + @Autowired + private IEquipmentLedgerService equipmentLedgerService; + @Autowired + private IToolInventoryRecordService toolInventoryRecordService; + @Autowired + private IOperationTicketService operationTicketService; + @Autowired + private IWorkPermitService workPermitService; + @Autowired + private IWarehouseService warehouseService; + @Autowired + private IManufacturerInfoService manufacturerInfoService; + @Autowired + private ISupplierInfoService supplierInfoService; + @Autowired + private IMaterialService materialService; + @Autowired + private IWorkOrderService workOrderService; + + @Override + public HomePageVO findCurrHomePageInfo() { + HomePageVO hp = new HomePageVO(); + + // Equipment Ledger Service + QueryWrapper qw1 = new QueryWrapper<>(); + qw1.lambda().eq(EquipmentLedger::getCheckStatus, 1); + qw1.lambda().eq(EquipmentLedger::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setEquipmentLedgerAudit(equipmentLedgerService.list(qw1)); + + // Tool Inventory Record Service + QueryWrapper qw2 = new QueryWrapper<>(); + qw2.lambda().eq(ToolInventoryRecord::getCheckStatus, 1); + qw2.lambda().eq(ToolInventoryRecord::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setToolInventoryRecordsAudit(toolInventoryRecordService.list(qw2)); + + // Operation Ticket Service + QueryWrapper qw3 = new QueryWrapper<>(); + qw3.lambda().eq(OperationTicket::getReviewStatus, 1); + qw3.lambda().eq(OperationTicket::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setOperationTicketAudit(operationTicketService.list(qw3)); + + // Work Permit Service + QueryWrapper qw4 = new QueryWrapper<>(); + qw4.lambda().eq(WorkPermit::getCheckStatus, 1); + qw4.lambda().eq(WorkPermit::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setWorkPermitAudit(workPermitService.list(qw4)); + + // Warehouse Service + QueryWrapper qw5 = new QueryWrapper<>(); + qw5.lambda().eq(Warehouse::getApprovalStatus, 1); + qw5.lambda().eq(Warehouse::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setWarehouseAudit(warehouseService.list(qw5)); + + // Manufacturer Info Service + QueryWrapper qw6 = new QueryWrapper<>(); + qw6.lambda().eq(ManufacturerInfo::getApprovalStatus, 1); + qw6.lambda().eq(ManufacturerInfo::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setManufacturerInfoAudit(manufacturerInfoService.list(qw6)); + + // Supplier Info Service + QueryWrapper qw7 = new QueryWrapper<>(); + qw7.lambda().eq(SupplierInfo::getApprovalStatus, 1); + qw7.lambda().eq(SupplierInfo::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setSupplierInfoAudit(supplierInfoService.list(qw7)); + + // Material Service + QueryWrapper qw8 = new QueryWrapper<>(); + qw8.lambda().eq(Material::getIstatus, 1L); + qw8.lambda().eq(Material::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setMaterialAudit(materialService.list(qw8)); + + // Work Order Service (already implemented) + QueryWrapper qw9 = new QueryWrapper<>(); + qw9.lambda().eq(WorkOrder::getApprovalStatus, 1); + qw9.lambda().eq(WorkOrder::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setWorkOrderAudit(workOrderService.list(qw9)); + + return hp; + } + +} diff --git a/src/main/java/org/energy/modules/system/vo/HomePageVO.java b/src/main/java/org/energy/modules/system/vo/HomePageVO.java new file mode 100644 index 0000000..17a9e6c --- /dev/null +++ b/src/main/java/org/energy/modules/system/vo/HomePageVO.java @@ -0,0 +1,32 @@ +package org.energy.modules.system.vo; + +import lombok.Data; +import org.energy.modules.leger.entity.EquipmentLedger; +import org.energy.modules.leger.entity.ToolInventoryRecord; +import org.energy.modules.smart.entity.OperationTicket; +import org.energy.modules.smart.entity.WorkOrder; +import org.energy.modules.smart.entity.WorkPermit; +import org.energy.modules.spares.entity.ManufacturerInfo; +import org.energy.modules.spares.entity.Material; +import org.energy.modules.spares.entity.SupplierInfo; +import org.energy.modules.spares.entity.Warehouse; + +import java.util.List; + +@Data +public class HomePageVO { + + // 设备台账 + private List equipmentLedgerAudit; + private List toolInventoryRecordsAudit; + // 智能两票 + private List operationTicketAudit; + private List workPermitAudit; + // 备件管理 + private List warehouseAudit; + private List manufacturerInfoAudit; + private List supplierInfoAudit; + private List materialAudit; + // 工单 + private List workOrderAudit; +} From c3a20ac19eb45c8c86940b2fb07a4da624cb010d Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Thu, 18 Jul 2024 09:28:10 +0800 Subject: [PATCH 2/5] =?UTF-8?q?getListByToolsCodeId=20=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../energy/modules/inspection/mapper/InspectionTasksMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f860d53..e48629d 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml @@ -82,7 +82,7 @@ and obj.is_deleted = '0' where task.is_deleted = '0' - and obj.kks_no = #{toolsCodeId} + and obj.tools_code_id = #{toolsCodeId} From 585f2b3e48d7767c4af62c587502bcf7120a0b44 Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Thu, 18 Jul 2024 10:15:42 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5=20=E4=BB=8A=E6=97=A5?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20=E6=9D=BF=E5=9D=97=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/RoleDataServiceImpl.java | 10 ++++++++++ .../java/org/energy/modules/system/vo/HomePageVO.java | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java b/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java index 94c11be..baa9881 100644 --- a/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java +++ b/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java @@ -17,6 +17,8 @@ package org.energy.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dayu.daf.core.tool.constant.DafConstant; +import org.energy.modules.inspection.entity.InspectionTasks; +import org.energy.modules.inspection.service.IInspectionTasksService; import org.energy.modules.leger.entity.EquipmentLedger; import org.energy.modules.leger.entity.ToolInventoryRecord; import org.energy.modules.leger.service.IEquipmentLedgerService; @@ -66,6 +68,8 @@ public class RoleDataServiceImpl implements IRoleDataService { private IMaterialService materialService; @Autowired private IWorkOrderService workOrderService; + @Autowired + private IInspectionTasksService inspectionTasksService; @Override public HomePageVO findCurrHomePageInfo() { @@ -125,6 +129,12 @@ public class RoleDataServiceImpl implements IRoleDataService { qw9.lambda().eq(WorkOrder::getIsDeleted, DafConstant.DB_NOT_DELETED); hp.setWorkOrderAudit(workOrderService.list(qw9)); + // Inspection Tasks Service + QueryWrapper qw10 = new QueryWrapper<>(); + qw10.lambda().eq(InspectionTasks::getTaskStatus, 1); + qw10.lambda().eq(InspectionTasks::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setInspectionTasksAudit(inspectionTasksService.list(qw10)); + return hp; } diff --git a/src/main/java/org/energy/modules/system/vo/HomePageVO.java b/src/main/java/org/energy/modules/system/vo/HomePageVO.java index 17a9e6c..f92a6a9 100644 --- a/src/main/java/org/energy/modules/system/vo/HomePageVO.java +++ b/src/main/java/org/energy/modules/system/vo/HomePageVO.java @@ -1,6 +1,7 @@ package org.energy.modules.system.vo; import lombok.Data; +import org.energy.modules.inspection.entity.InspectionTasks; import org.energy.modules.leger.entity.EquipmentLedger; import org.energy.modules.leger.entity.ToolInventoryRecord; import org.energy.modules.smart.entity.OperationTicket; @@ -16,6 +17,9 @@ import java.util.List; @Data public class HomePageVO { + // 巡检任务 + private List inspectionTasksAudit; + // 设备台账 private List equipmentLedgerAudit; private List toolInventoryRecordsAudit; From 1ec4d99326cb8c39d93c8857e16be8a3fb95046b Mon Sep 17 00:00:00 2001 From: weitingdong <2480899115@qq.com> Date: Thu, 18 Jul 2024 10:32:22 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A5=A8=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkPermitController.java | 18 ++++++++++------- .../modules/smart/mapper/WorkPermitMapper.xml | 20 +++++++++---------- .../energy/modules/smart/vo/WorkPermitVO.java | 2 ++ 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/energy/modules/smart/controller/WorkPermitController.java b/src/main/java/org/energy/modules/smart/controller/WorkPermitController.java index 5e02f62..2d761d2 100644 --- a/src/main/java/org/energy/modules/smart/controller/WorkPermitController.java +++ b/src/main/java/org/energy/modules/smart/controller/WorkPermitController.java @@ -52,7 +52,9 @@ import com.dayu.daf.core.boot.ctrl.DafController; import springfox.documentation.annotations.ApiIgnore; import java.net.URLEncoder; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; @@ -88,9 +90,8 @@ public class WorkPermitController extends DafController { @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入workPermit") - public R> list(WorkPermit workPermit, Query query) { + public R> list(WorkPermitVO workPermit, Query query) { QueryWrapper qw = new QueryWrapper<>(); - qw.orderByAsc("eq_ledger_code"); //场站 if (null != workPermit.getStations()) { qw.lambda().eq(WorkPermit::getStations, workPermit.getStations()); @@ -115,15 +116,18 @@ public class WorkPermitController extends DafController { if (StringUtil.isNotEmpty(workPermit.getIssuer())) { qw.lambda().like(WorkPermit::getIssuer, workPermit.getIssuer()); } - //计划开始时间 - if (null != workPermit.getPlanStartDate()) { - qw.lambda().like(WorkPermit::getPlanStartDate, workPermit.getPlanStartDate()); - } + //工作负责人 if (StringUtil.isNotEmpty(workPermit.getWorkChargePerson())) { qw.lambda().like(WorkPermit::getWorkChargePerson, workPermit.getWorkChargePerson()); } - IPage pages = workPermitService.page(Condition.getPage(query), Condition.getQueryWrapper(workPermit)); + + //计划开始时间 + if (null != workPermit.getPlanStartDateExt()) { + String planStartDate = workPermit.getPlanStartDateExt().substring(0,10); + qw.lambda().last(" and plan_start_date >= TO_TIMESTAMP('"+planStartDate + " 00:00:00','YYYY-MM-DD HH24:MI:SS')"); + } + IPage pages = workPermitService.page(Condition.getPage(query), qw); return R.data(pages); } diff --git a/src/main/java/org/energy/modules/smart/mapper/WorkPermitMapper.xml b/src/main/java/org/energy/modules/smart/mapper/WorkPermitMapper.xml index a7c5078..95ad774 100644 --- a/src/main/java/org/energy/modules/smart/mapper/WorkPermitMapper.xml +++ b/src/main/java/org/energy/modules/smart/mapper/WorkPermitMapper.xml @@ -68,31 +68,31 @@ , work_state , check_status from - smt_work_permit - where is_deleted = 0 + smt_work_permit a + where a.is_deleted = 0 - and a.work_ticket_no = #{vo.workTicketNo} + and a.work_ticket_no LIKE CONCAT('%', #{vo.workTicketNo}, '%') - and a.work_ticket_type = #{vo.workTicketType} + and a.work_ticket_type LIKE CONCAT('%', #{vo.workTicketType}, '%') - and a.work_charge_person = #{vo.workChargePerson} + and a.work_charge_person LIKE CONCAT('%', #{vo.workChargePerson}, '%') - and a.licensors = #{vo.licensors} + and a.licensors LIKE CONCAT('%', #{vo.licensors}, '%') - and a.issuer = #{vo.issuer} + and a.issuer LIKE CONCAT('%', #{vo.issuer}, '%') - - and a.plan_start_date = #{vo.planStartDate} + + and a.plan_start_date >= TO_TIMESTAMP(#{vo.planStartDateExt},'Dy Mon DD YYYY HH24:MI:SS')AT TIME ZONE 'GMT-8' and a.work_state = #{vo.workState} - and b.stations = ${vo.stations} + and a.stations = #{vo.stations} diff --git a/src/main/java/org/energy/modules/smart/vo/WorkPermitVO.java b/src/main/java/org/energy/modules/smart/vo/WorkPermitVO.java index e333ff3..9934013 100644 --- a/src/main/java/org/energy/modules/smart/vo/WorkPermitVO.java +++ b/src/main/java/org/energy/modules/smart/vo/WorkPermitVO.java @@ -17,4 +17,6 @@ import io.swagger.annotations.ApiModel; public class WorkPermitVO extends WorkPermit { private static final long serialVersionUID = 1L; + private String planStartDateExt; + } From 3c5dc50cf12a2d410eadf32ed37b7d3dc7136728 Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Thu, 18 Jul 2024 10:42:17 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5=20=E4=BB=8A=E6=97=A5?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/RoleDataServiceImpl.java | 11 +++++++++++ .../java/org/energy/modules/system/vo/HomePageVO.java | 3 +++ 2 files changed, 14 insertions(+) diff --git a/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java b/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java index baa9881..3d71f94 100644 --- a/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java +++ b/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java @@ -23,6 +23,8 @@ import org.energy.modules.leger.entity.EquipmentLedger; import org.energy.modules.leger.entity.ToolInventoryRecord; import org.energy.modules.leger.service.IEquipmentLedgerService; import org.energy.modules.leger.service.IToolInventoryRecordService; +import org.energy.modules.release.entity.ProductionInformation; +import org.energy.modules.release.service.IProductionInformationService; import org.energy.modules.smart.entity.OperationTicket; import org.energy.modules.smart.entity.WorkOrder; import org.energy.modules.smart.entity.WorkPermit; @@ -70,6 +72,8 @@ public class RoleDataServiceImpl implements IRoleDataService { private IWorkOrderService workOrderService; @Autowired private IInspectionTasksService inspectionTasksService; + @Autowired + private IProductionInformationService productionInformationService; @Override public HomePageVO findCurrHomePageInfo() { @@ -135,6 +139,13 @@ public class RoleDataServiceImpl implements IRoleDataService { qw10.lambda().eq(InspectionTasks::getIsDeleted, DafConstant.DB_NOT_DELETED); hp.setInspectionTasksAudit(inspectionTasksService.list(qw10)); + // ProductionInformation Service + QueryWrapper qw11 = new QueryWrapper<>(); + qw11.lambda().eq(ProductionInformation::getCheckstatus, 2); + qw11.lambda().eq(ProductionInformation::getIsDeleted, DafConstant.DB_NOT_DELETED); + qw11.lambda().eq(ProductionInformation::getIsDiscontinue, 1); + hp.setProductionInformationAudit(productionInformationService.list(qw11)); + return hp; } diff --git a/src/main/java/org/energy/modules/system/vo/HomePageVO.java b/src/main/java/org/energy/modules/system/vo/HomePageVO.java index f92a6a9..dead014 100644 --- a/src/main/java/org/energy/modules/system/vo/HomePageVO.java +++ b/src/main/java/org/energy/modules/system/vo/HomePageVO.java @@ -4,6 +4,7 @@ import lombok.Data; import org.energy.modules.inspection.entity.InspectionTasks; import org.energy.modules.leger.entity.EquipmentLedger; import org.energy.modules.leger.entity.ToolInventoryRecord; +import org.energy.modules.release.entity.ProductionInformation; import org.energy.modules.smart.entity.OperationTicket; import org.energy.modules.smart.entity.WorkOrder; import org.energy.modules.smart.entity.WorkPermit; @@ -33,4 +34,6 @@ public class HomePageVO { private List materialAudit; // 工单 private List workOrderAudit; + // 生产信息发布 + private List productionInformationAudit; }