From 3b7cc5918702452993e6ce4c97c3da9ef147c903 Mon Sep 17 00:00:00 2001 From: siontion Date: Wed, 5 Jun 2024 19:01:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E5=8D=95=20=E8=B4=9F?= =?UTF-8?q?=E8=B4=A3=E4=BA=BA=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taskdispatch/TaskDispatchController.java | 2 ++ .../taskdispatch/vo/TaskDispatchRespVO.java | 7 +++++ .../taskdispatch/TaskDispatchDetailDO.java | 6 ++++ .../taskdispatch/TaskDispatchServiceImpl.java | 30 +++++++++++++++---- sql/v1.0.0/2.business/1.structure.sql | 4 +++ 5 files changed, 43 insertions(+), 6 deletions(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskdispatch/TaskDispatchController.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskdispatch/TaskDispatchController.java index 2e58c628..e19d9e2c 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskdispatch/TaskDispatchController.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskdispatch/TaskDispatchController.java @@ -27,6 +27,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskdispatch/vo/TaskDispatchRespVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskdispatch/vo/TaskDispatchRespVO.java index 2f55f318..b1a56398 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskdispatch/vo/TaskDispatchRespVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskdispatch/vo/TaskDispatchRespVO.java @@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.time.LocalDateTime; +import java.util.List; @Schema(description = "管理后台 - 派工单 Response VO") @Data @@ -130,5 +131,11 @@ public class TaskDispatchRespVO { @Schema(description = "计划状态") private Integer planStatus; + @Schema(description = "负责人") + private List owners; + + @Schema(description = "负责人") + private List ownerNames; + } diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/taskdispatch/TaskDispatchDetailDO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/taskdispatch/TaskDispatchDetailDO.java index 59ae5f18..35509d94 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/taskdispatch/TaskDispatchDetailDO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/taskdispatch/TaskDispatchDetailDO.java @@ -6,6 +6,7 @@ import lombok.*; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; /** * 派工明细 DO @@ -39,6 +40,11 @@ public class TaskDispatchDetailDO extends BaseDO { * 负责人 */ private Long owner; + @TableField(exist = false) + private List owners; + @TableField(exist = false) + private List ownerNames; + private String ownerIds; /** * 预计工时 */ 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 b20e9fd9..a20c0088 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 @@ -29,6 +29,7 @@ import com.chanko.yunxi.mes.module.biz.enums.*; import com.chanko.yunxi.mes.module.biz.manager.CrossOrderManager; import com.chanko.yunxi.mes.module.biz.service.serialnumber.SerialNumberService; import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; +import com.chanko.yunxi.mes.module.system.dal.mysql.user.AdminUserMapper; import com.chanko.yunxi.mes.module.system.service.user.AdminUserService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -40,10 +41,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.text.SimpleDateFormat; import java.time.LocalDateTime; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -76,6 +74,8 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { @Resource private WorkshopMapper workshopMapper; + @Resource + private AdminUserMapper adminUserMapper; @Override @Transactional(rollbackFor = Exception.class) @@ -227,7 +227,22 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { @Override public List getTaskDispatchDetailListByDispatchId(Long dispatchId) { - return taskDispatchDetailMapper.selectListByDispatchId(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); + + }); + return result; } @Override @@ -380,7 +395,10 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { } private void createTaskDispatchDetailList(Long dispatchId, List list) { - list.forEach(o -> o.setDispatchId(dispatchId)); + list.forEach(o -> { + o.setDispatchId(dispatchId); + o.setOwnerIds(o.getOwners().toString().replace("[","").replace("]","")); + }); // 分组更新与插入 List updateList = list.stream().filter(o -> o.getId() != null).collect(Collectors.toList()); List insertList = 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 9d282124..50a977cc 100644 --- a/sql/v1.0.0/2.business/1.structure.sql +++ b/sql/v1.0.0/2.business/1.structure.sql @@ -245,3 +245,7 @@ CREATE TABLE `base_process_setting` ( `tenant_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '租户编号', PRIMARY KEY (`id`) ) ENGINE=InnoDB COMMENT='工时工价表'; + + +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 '负责人' ;