From 883d2d40abdf5057bba4a1ef311212a79c805430 Mon Sep 17 00:00:00 2001 From: zengchenxi Date: Thu, 25 Apr 2024 17:46:17 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E3=80=91=E5=B7=A5?= =?UTF-8?q?=E8=89=BA=E8=AE=BE=E8=AE=A1=E6=8E=A5=E5=8F=A3=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processdesign/vo/ProcessDesignRespVO.java | 3 +++ .../dataobject/processdesign/ProcessDesignDO.java | 2 ++ .../mysql/processdesign/ProcessDesignMapper.java | 14 +++++++++----- .../processdesign/ProcessDesignServiceImpl.java | 10 +++------- .../src/views/biz/processdesign/3d.vue | 8 ++++---- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/processdesign/vo/ProcessDesignRespVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/processdesign/vo/ProcessDesignRespVO.java index c981c765..a916de25 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/processdesign/vo/ProcessDesignRespVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/processdesign/vo/ProcessDesignRespVO.java @@ -126,4 +126,7 @@ public class ProcessDesignRespVO { @Schema(description = "项目状态") private Integer planStatus; + @Schema(description = "项目状态") + private Integer spec; + } diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/processdesign/ProcessDesignDO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/processdesign/ProcessDesignDO.java index 42f6f37a..a3a2f348 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/processdesign/ProcessDesignDO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/processdesign/ProcessDesignDO.java @@ -132,4 +132,6 @@ public class ProcessDesignDO extends BaseDO { @TableField(exist = false) private Integer planStatus; + @TableField(exist = false) + private String spec; } diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/processdesign/ProcessDesignMapper.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/processdesign/ProcessDesignMapper.java index f78cab88..2f662022 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/processdesign/ProcessDesignMapper.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/processdesign/ProcessDesignMapper.java @@ -4,6 +4,7 @@ import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; import com.chanko.yunxi.mes.module.biz.controller.admin.processdesign.vo.ProcessDesignPageReqVO; import com.chanko.yunxi.mes.module.biz.dal.dataobject.customer.CustomerDO; +import com.chanko.yunxi.mes.module.biz.dal.dataobject.material.MaterialDO; import com.chanko.yunxi.mes.module.biz.dal.dataobject.plan.PlanDO; import com.chanko.yunxi.mes.module.biz.dal.dataobject.processdesign.ProcessDesignDO; import com.chanko.yunxi.mes.module.biz.dal.dataobject.projectorder.ProjectOrderDO; @@ -32,13 +33,14 @@ public interface ProcessDesignMapper extends BaseMapperX { .select("u1.nickname as projectOwnerName") .select("b.two_dim_date as twoDimDate", "b.three_dim_date as threeDimDate") .select("u4.nickname as twoDimOwnerName", "u5.nickname as threeDimOwnerName") - .select("c.name as projectSubName", "b.project_sub_code as projectSubCode") + .select("f.name as projectSubName", "f.code as projectSubCode", "f.spec") .select("z.progress") .leftJoin(PlanDO.class, "a", PlanDO::getId, ProcessDesignDO::getPlanId) .leftJoin("project_plan_sub b on b.project_plan_id = t.plan_id and b.project_sub_id = t.project_sub_id") .leftJoin(ProjectOrderSubDO.class, "c", ProjectOrderSubDO::getId, ProcessDesignDO::getProjectSubId) .leftJoin(ProjectOrderDO.class, "d", ProjectOrderDO::getId, ProcessDesignDO::getProjectId) .leftJoin(CustomerDO.class, "e", CustomerDO::getId, ProjectOrderDO::getCustomerId) + .leftJoin(MaterialDO.class, "f", MaterialDO::getId, ProjectOrderSubDO::getMaterialId) .leftJoin(AdminUserDO.class, "u1", AdminUserDO::getId, PlanDO::getProjectOwner) .leftJoin("system_users u4 on u4.id = b.two_dim_owner") .leftJoin("system_users u5 on u5.id = b.three_dim_owner") @@ -53,7 +55,7 @@ public interface ProcessDesignMapper extends BaseMapperX { .eq(reqVO.getProperty() != null, ProjectOrderDO::getProperty, reqVO.getProperty()) .like(!StringUtils.isEmpty(reqVO.getThreeDimOwnerName()), "u5.nickname", reqVO.getThreeDimOwnerName()) .like(!StringUtils.isEmpty(reqVO.getTwoDimOwnerName()), "u4.nickname", reqVO.getTwoDimOwnerName()) - .like(!StringUtils.isEmpty(reqVO.getProjectSubName()), ProjectOrderSubDO::getName, reqVO.getProjectSubName()) + .and(!StringUtils.isEmpty(reqVO.getProjectSubName()), Wrapper -> Wrapper.like(MaterialDO::getName, reqVO.getProjectSubName()).or().like(MaterialDO::getCode, reqVO.getProjectSubName())) .eq(!StringUtils.isEmpty(reqVO.getProcessDesignType()), ProcessDesignDO::getProcessDesignType, reqVO.getProcessDesignType()) .in(reqVO.getProcessDesignTypeList() != null && !reqVO.getProcessDesignTypeList().isEmpty(), ProcessDesignDO::getProcessDesignType, reqVO.getProcessDesignTypeList()) .eq(reqVO.getProjectId() != null, ProcessDesignDO::getProjectId, reqVO.getProjectId()) @@ -82,12 +84,13 @@ public interface ProcessDesignMapper extends BaseMapperX { .select("u1.nickname as projectOwnerName") .select("b.two_dim_date as twoDimDate", "b.three_dim_date as threeDimDate") .select("u4.nickname as twoDimOwnerName", "u5.nickname as threeDimOwnerName") - .select("c.name as projectSubName", "b.project_sub_code as projectSubCode") + .select("f.name as projectSubName", "f.code as projectSubCode", "f.spec") .leftJoin(PlanDO.class, "a", PlanDO::getId, ProcessDesignDO::getPlanId) .leftJoin("project_plan_sub b on b.project_plan_id = t.plan_id and b.project_sub_id = t.project_sub_id") .leftJoin(ProjectOrderSubDO.class, "c", ProjectOrderSubDO::getId, ProcessDesignDO::getProjectSubId) .leftJoin(ProjectOrderDO.class, "d", ProjectOrderDO::getId, ProcessDesignDO::getProjectId) .leftJoin(CustomerDO.class, "e", CustomerDO::getId, ProjectOrderDO::getCustomerId) + .leftJoin(MaterialDO.class, "f", MaterialDO::getId, ProjectOrderSubDO::getMaterialId) .leftJoin(AdminUserDO.class, "u1", AdminUserDO::getId, PlanDO::getProjectOwner) .leftJoin("system_users u4 on u4.id = b.two_dim_owner") .leftJoin("system_users u5 on u5.id = b.three_dim_owner") @@ -101,13 +104,14 @@ public interface ProcessDesignMapper extends BaseMapperX { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.select(ProcessDesignDO::getProjectId, ProcessDesignDO::getProjectSubId) .select("a.status as planStatus") - .select("c.name as projectSubName") .select("e.name as customerName") .select("d.code as projectCode", "d.project_name as projectName", "d.business_line as businessLine", "d.property","d.is_urgency as isUrgency") + .select("f.name as projectSubName", "f.code as projectSubCode", "f.spec") .leftJoin(PlanDO.class, "a", PlanDO::getId, ProcessDesignDO::getPlanId) .leftJoin(ProjectOrderSubDO.class, "c", ProjectOrderSubDO::getId, ProcessDesignDO::getProjectSubId) .leftJoin(ProjectOrderDO.class, "d", ProjectOrderDO::getId, ProcessDesignDO::getProjectId) .leftJoin(CustomerDO.class, "e", CustomerDO::getId, ProjectOrderDO::getCustomerId) + .leftJoin(MaterialDO.class, "f", MaterialDO::getId, ProjectOrderSubDO::getMaterialId) .groupBy("d.id,c.id") .orderByDesc(ProjectOrderDO::getId) .disableSubLogicDel(); @@ -116,7 +120,7 @@ public interface ProcessDesignMapper extends BaseMapperX { .like(!StringUtils.isEmpty(reqVO.getProjectCode()), ProjectOrderDO::getCode, reqVO.getProjectCode()) .like(!StringUtils.isEmpty(reqVO.getCustomerName()), CustomerDO::getName, reqVO.getCustomerName()) .like(!StringUtils.isEmpty(reqVO.getProjectName()), ProjectOrderDO::getProjectName, reqVO.getProjectName()) - .like(!StringUtils.isEmpty(reqVO.getProjectSubName()), ProjectOrderSubDO::getName, reqVO.getProjectSubName()) + .and(!StringUtils.isEmpty(reqVO.getProjectSubName()), Wrapper -> Wrapper.like(MaterialDO::getName, reqVO.getProjectSubName()).or().like(MaterialDO::getCode, reqVO.getProjectSubName())) ; return selectPage(reqVO, query); } diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/processdesign/ProcessDesignServiceImpl.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/processdesign/ProcessDesignServiceImpl.java index 2bb3da8b..dfe05ec2 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/processdesign/ProcessDesignServiceImpl.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/processdesign/ProcessDesignServiceImpl.java @@ -3,12 +3,12 @@ package com.chanko.yunxi.mes.module.biz.service.processdesign; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; import com.chanko.yunxi.mes.framework.security.core.util.SecurityFrameworkUtils; -import com.chanko.yunxi.mes.module.biz.dal.mysql.processdesign.ProcessDesignMapper; -import com.chanko.yunxi.mes.module.biz.dal.mysql.processdesign.ProcessDesignProgressMapper; import com.chanko.yunxi.mes.module.biz.controller.admin.processdesign.vo.ProcessDesignPageReqVO; import com.chanko.yunxi.mes.module.biz.controller.admin.processdesign.vo.ProcessDesignSaveReqVO; import com.chanko.yunxi.mes.module.biz.dal.dataobject.processdesign.ProcessDesignDO; import com.chanko.yunxi.mes.module.biz.dal.dataobject.processdesign.ProcessDesignProgressDO; +import com.chanko.yunxi.mes.module.biz.dal.mysql.processdesign.ProcessDesignMapper; +import com.chanko.yunxi.mes.module.biz.dal.mysql.processdesign.ProcessDesignProgressMapper; import com.chanko.yunxi.mes.module.biz.enums.ProcessDesignTypeEnum; import com.chanko.yunxi.mes.module.biz.enums.WarningEnum; import com.chanko.yunxi.mes.module.biz.vo.WarningMessageVO; @@ -107,11 +107,7 @@ public class ProcessDesignServiceImpl implements ProcessDesignService { PageResult detailResult = processDesignMapper.selectPage(reqVO); if(detailResult.getTotal() > 0){ detailResult.getList().forEach(processDesign -> { - if(ProcessDesignTypeEnum.BLUEPRINT_WORKBLANK.name().equals(processDesign.getProcessDesignType())){ - processDesignDO.setBlankDate(processDesign.getBlankDate()) - .setBlankOwnerName(processDesign.getBlankOwnerName()) - .setProgressBlank(processDesign.getProgress()); - }else if(ProcessDesignTypeEnum.BLUEPRINT_3D.name().equals(processDesign.getProcessDesignType())){ + if(ProcessDesignTypeEnum.BLUEPRINT_3D.name().equals(processDesign.getProcessDesignType())){ processDesignDO.setThreeDimDate(processDesign.getThreeDimDate()) .setThreeDimOwnerName(processDesign.getThreeDimOwnerName()) .setProgress3d(processDesign.getProgress()); diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/processdesign/3d.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/processdesign/3d.vue index 593c0124..39516340 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/biz/processdesign/3d.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/processdesign/3d.vue @@ -59,18 +59,18 @@ - + - + - + - +