From b8a508995cf1ac0e05fe38359f21b2f5814b96ea Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Fri, 19 Jul 2024 15:34:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=20=20=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=87=BA=E5=BA=93=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 --- .../service/impl/RoleDataServiceImpl.java | 26 +++++++++++++------ .../energy/modules/system/vo/HomePageVO.java | 7 +++-- 2 files changed, 21 insertions(+), 12 deletions(-) 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 3d71f94..98eb1a3 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 @@ -31,14 +31,8 @@ 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.spares.entity.*; +import org.energy.modules.spares.service.*; import org.energy.modules.system.service.IRoleDataService; import org.energy.modules.system.vo.HomePageVO; import org.springframework.beans.factory.annotation.Autowired; @@ -74,6 +68,10 @@ public class RoleDataServiceImpl implements IRoleDataService { private IInspectionTasksService inspectionTasksService; @Autowired private IProductionInformationService productionInformationService; + @Autowired + private IInboundService inboundService; + @Autowired + private IOutboundService outboundService; @Override public HomePageVO findCurrHomePageInfo() { @@ -146,6 +144,18 @@ public class RoleDataServiceImpl implements IRoleDataService { qw11.lambda().eq(ProductionInformation::getIsDiscontinue, 1); hp.setProductionInformationAudit(productionInformationService.list(qw11)); + // Inbound Service + QueryWrapper qw12 = new QueryWrapper<>(); + qw12.lambda().eq(Inbound::getIstatus, 1); + qw12.lambda().eq(Inbound::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setInboundAudit(inboundService.list(qw12)); + + // Outbound Service + QueryWrapper qw13 = new QueryWrapper<>(); + qw13.lambda().eq(Outbound::getIstatus, 1); + qw13.lambda().eq(Outbound::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setOutboundAudit(outboundService.list(qw13)); + 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 dead014..fc1abaf 100644 --- a/src/main/java/org/energy/modules/system/vo/HomePageVO.java +++ b/src/main/java/org/energy/modules/system/vo/HomePageVO.java @@ -8,10 +8,7 @@ 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; -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.entity.*; import java.util.List; @@ -32,6 +29,8 @@ public class HomePageVO { private List manufacturerInfoAudit; private List supplierInfoAudit; private List materialAudit; + private List inboundAudit; + private List outboundAudit; // 工单 private List workOrderAudit; // 生产信息发布 From f7cc8ab80f9c4706904ffcac46f7f93fe25544a4 Mon Sep 17 00:00:00 2001 From: weitingdong <2480899115@qq.com> Date: Fri, 19 Jul 2024 16:20:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A5=E6=9C=9Fnull=E7=9A=84=E5=9C=BA?= =?UTF-8?q?=E5=90=88=20=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/energy/modules/leger/entity/EquipmentLedger.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/org/energy/modules/leger/entity/EquipmentLedger.java b/src/main/java/org/energy/modules/leger/entity/EquipmentLedger.java index 171bcab..dbd2fdb 100644 --- a/src/main/java/org/energy/modules/leger/entity/EquipmentLedger.java +++ b/src/main/java/org/energy/modules/leger/entity/EquipmentLedger.java @@ -1,5 +1,7 @@ package org.energy.modules.leger.entity; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.dayu.daf.core.mp.base.BaseEntity; import java.io.Serializable; @@ -105,11 +107,13 @@ public class EquipmentLedger extends BaseEntity { * 出厂日期 */ @ApiModelProperty(value = "出厂日期") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String productionDate; /** * 安装日期 */ @ApiModelProperty(value = "安装日期") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String installDate; /** * 调试单位 @@ -175,6 +179,7 @@ public class EquipmentLedger extends BaseEntity { * 制造年月 */ @ApiModelProperty(value = "制造年月") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String manufactureDate; /** * 大小尺寸 @@ -200,6 +205,7 @@ public class EquipmentLedger extends BaseEntity { * 投运日期 */ @ApiModelProperty(value = "投运日期") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String operationDate; /** * 安装单位