From 4c61fd093f8c9624184f322f732758b4e8c0ec63 Mon Sep 17 00:00:00 2001 From: siontion Date: Fri, 7 Jun 2024 15:41:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E8=AE=BE=E8=AE=A1=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=A7=84=E6=A0=BC=EF=BC=8C=E5=90=8D=E7=A7=B0=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/ProcessDesignPageReqVO.java | 3 ++ .../processdesign/ProcessDesignMapper.java | 2 ++ .../taskdispatch/TaskDispatchServiceImpl.java | 30 +++++++++---------- sql/v1.0.0/2.business/1.structure.sql | 1 + 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/processdesign/vo/ProcessDesignPageReqVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/processdesign/vo/ProcessDesignPageReqVO.java index 17e46ce0..d2327cce 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/processdesign/vo/ProcessDesignPageReqVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/processdesign/vo/ProcessDesignPageReqVO.java @@ -46,6 +46,9 @@ public class ProcessDesignPageReqVO extends PageParam { @Schema(description = "项目编号") private String projectCode; + @Schema(description = "规格") + private String spec; + @Schema(description = "客户名称") private String customerName; 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 b6cadf58..f99b90e8 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 @@ -119,8 +119,10 @@ public interface ProcessDesignMapper extends BaseMapperX { query.in(reqVO.getProcessDesignTypeList() != null && !reqVO.getProcessDesignTypeList().isEmpty(), ProcessDesignDO::getProcessDesignType, reqVO.getProcessDesignTypeList()) .like(!StringUtils.isEmpty(reqVO.getProjectCode()), ProjectOrderDO::getCode, reqVO.getProjectCode()) .like(!StringUtils.isEmpty(reqVO.getCustomerName()), CustomerDO::getName, reqVO.getCustomerName()) + .like(!StringUtils.isEmpty(reqVO.getSpec()), MaterialDO::getSpec, reqVO.getSpec()) .like(!StringUtils.isEmpty(reqVO.getProjectName()), ProjectOrderDO::getProjectName, reqVO.getProjectName()) .and(!StringUtils.isEmpty(reqVO.getProjectSubCode()), Wrapper -> Wrapper.like(MaterialDO::getName, reqVO.getProjectSubCode()).or().like(MaterialDO::getCode, reqVO.getProjectSubCode())) + .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/taskdispatch/TaskDispatchServiceImpl.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchServiceImpl.java index a20c0088..7c3cf5f2 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchServiceImpl.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchServiceImpl.java @@ -228,20 +228,20 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { @Override public List getTaskDispatchDetailListByDispatchId(Long dispatchId) { List result = taskDispatchDetailMapper.selectListByDispatchId(dispatchId); - result.forEach(map ->{ - List ids = new ArrayList<>(); - List names = new ArrayList<>(); - if(map.getOwnerIds() != null){ - Arrays.stream(map.getOwnerIds().split(",")).forEach(item ->{ - ids.add(Long.parseLong(item.trim())); - names.add(adminUserMapper.selectById(Long.parseLong(item.trim())).getNickname()); - }); - } - - map.setOwners(ids); - map.setOwnerNames(names); - - }); +// result.forEach(map ->{ +// List ids = new ArrayList<>(); +// List names = new ArrayList<>(); +// if(map.getOwnerIds() != null){ +// Arrays.stream(map.getOwnerIds().split(",")).forEach(item ->{ +// ids.add(Long.parseLong(item.trim())); +// names.add(adminUserMapper.selectById(Long.parseLong(item.trim())).getNickname()); +// }); +// } +// +// map.setOwners(ids); +// map.setOwnerNames(names); +// +// }); return result; } @@ -397,7 +397,7 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { private void createTaskDispatchDetailList(Long dispatchId, List list) { list.forEach(o -> { o.setDispatchId(dispatchId); - o.setOwnerIds(o.getOwners().toString().replace("[","").replace("]","")); +// o.setOwnerIds(o.getOwners().toString().replace("[","").replace("]","")); }); // 分组更新与插入 List updateList = list.stream().filter(o -> o.getId() != null).collect(Collectors.toList()); diff --git a/sql/v1.0.0/2.business/1.structure.sql b/sql/v1.0.0/2.business/1.structure.sql index 50a977cc..0a468b74 100644 --- a/sql/v1.0.0/2.business/1.structure.sql +++ b/sql/v1.0.0/2.business/1.structure.sql @@ -249,3 +249,4 @@ CREATE TABLE `base_process_setting` ( alter table pro_task_dispatch_detail add column `owner_ids` VARCHAR(128) null comment '多个负责人' after `owner`; alter table pro_task_dispatch_detail modify column `owner` bigint(20) null comment '负责人' ; +alter table pro_task_report add COLUMN `has_synch` tinyint(1) default null comment '是否已同步用友';