From b3e08a05d3b1281b79fc58546688000c4424903d Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Wed, 25 Jun 2025 09:42:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/UserController.java | 23 +++++------ .../base/service/impl/UserService.java | 38 +++++++++++++++++++ .../CoscoCategoryLibraryController.java | 14 +++++++ .../CoscoCategoryLibraryContainMapper.java | 7 ++++ .../CoscoCategoryLibraryContainMapper.xml | 16 ++++++++ .../dao/mapper/CoscoCategoryLibraryMapper.xml | 2 +- .../ICoscoCategoryLibraryContainService.java | 6 +++ .../service/ICoscoCategoryLibraryService.java | 12 ++++++ ...oscoCategoryLibraryContainServiceImpl.java | 11 ++++++ .../impl/CoscoCategoryLibraryServiceImpl.java | 5 +++ .../impl/CoscoEvaluateTaskServiceImpl.java | 29 +++++++++++++- .../vo/AddCoscoEvaluateTaskVo.java | 6 +++ 12 files changed, 152 insertions(+), 17 deletions(-) create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserService.java diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/UserController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/UserController.java index 442ecd2..c4d2ece 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/UserController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/UserController.java @@ -1,7 +1,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.controller; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.zyhy.ebtp.supplier.base.service.impl.UserService; import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -14,30 +16,23 @@ import java.util.List; public class UserController { + @Autowired + private UserService userService; @GetMapping("/getUserList") public BaseResponse getUserList() { - return BaseResponse.success(getUser()); + return BaseResponse.success(userService.getUser()); } - - private List getUser() { - List userList = new ArrayList<>(); - - for (int i = 1; i <= 10; i++) { - UserVo user = new UserVo(); - user.setUserId("U" + String.format("%03d", i)); // U001 ~ U010 - user.setUserName("用户" + i); - user.setUserDept("部门" + ((i % 3) + 1)); // 部门1、部门2、部门3轮换 - user.setUserDeptId("D" + ((i % 3) + 1)); // D1、D2、D3轮换 - userList.add(user); - } - return userList; + @GetMapping("/getDeptList") + public BaseResponse getDeptList() { + return BaseResponse.success(userService.getDept()); } + } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserService.java new file mode 100644 index 0000000..eb31066 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserService.java @@ -0,0 +1,38 @@ +package com.chinaunicom.zyhy.ebtp.supplier.base.service.impl; + +import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class UserService { + + public List getDept() { + List deptList = new ArrayList<>(); + for (int i = 1; i <= 10; i++) { + UserVo dept = new UserVo(); + dept.setUserDeptId("D" + String.format("%03d", i)); + dept.setUserDept("部门" + i); + deptList.add(dept); + } + return deptList; + } + + + public List getUser() { + List userList = new ArrayList<>(); + + for (int i = 1; i <= 10; i++) { + UserVo user = new UserVo(); + user.setUserId("U" + String.format("%03d", i)); // U001 ~ U010 + user.setUserName("用户" + i); + user.setUserDept("部门" + ((i % 3) + 1)); // 部门1、部门2、部门3轮换 + user.setUserDeptId("D" + ((i % 3) + 1)); // D1、D2、D3轮换 + userList.add(user); + } + return userList; + } + +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryController.java index 0eef05b..269cd3e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryController.java @@ -105,7 +105,21 @@ public class CoscoCategoryLibraryController extends BaseController { */ @PostMapping("/approval") public BaseResponse approval(@RequestBody CoscoCategoryVO coscoCategoryVO) { + CoscoCategoryLibrary coscoCategoryLibrary = coscoCategoryLibraryService.selectCoscoCategoryLibraryById(coscoCategoryVO.getId()); + if(coscoCategoryLibrary.getDeptId()==null){ + throw new RuntimeException("请选择负责部门"); + } return BaseResponse.success(coscoCategoryLibraryService.approval(coscoCategoryVO)); } + /** + * 锁定列表查询 + * @param + * @return + */ + @GetMapping("/superiorLockList") + public BaseResponse superiorLockList() { + return BaseResponse.success(coscoCategoryLibraryService.superiorLockList()); + } + } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/CoscoCategoryLibraryContainMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/CoscoCategoryLibraryContainMapper.java index 3ea663c..87b2562 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/CoscoCategoryLibraryContainMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/CoscoCategoryLibraryContainMapper.java @@ -62,4 +62,11 @@ public interface CoscoCategoryLibraryContainMapper extends IBaseMapper list); + + /** + * 获取上级部门锁定品类信息 + * @param deptIds + * @return + */ + List selectLoctyList(List deptIds); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml index 22bd1c7..19cb4c9 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml @@ -67,4 +67,20 @@ #{categoryLibraryId} + + + diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml index 6e34d57..1778191 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml @@ -209,7 +209,7 @@ SELECT ccl.id, ccl.name, - GROUP_CONCAT(cc.category_name SEPARATOR ', ') AS categoryNames, + GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryNames, ccl.area, "集团" AS deptName, "张三" AS createName, diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibraryContainService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibraryContainService.java index 893ed20..444aa98 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibraryContainService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibraryContainService.java @@ -75,4 +75,10 @@ public interface ICoscoCategoryLibraryContainService extends IBaseService selectByLibraryId(String id); + + /** + * 锁定列表查询 + * @return + */ + List selectLoctyList(); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibraryService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibraryService.java index bd7c0e5..e9f81bc 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibraryService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibraryService.java @@ -90,5 +90,17 @@ public interface ICoscoCategoryLibraryService extends IBaseService superiorLockList(); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java index 6182567..ccfa70a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java @@ -126,4 +126,15 @@ public class CoscoCategoryLibraryContainServiceImpl extends BaseServiceImpl selectLoctyList() { + List deptIds=new ArrayList<>(); + deptIds.add("dep01"); + return coscoCategoryLibraryContainMapper.selectLoctyList(deptIds); + } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java index e048afc..a39816e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java @@ -225,4 +225,9 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl superiorLockList() { + return coscoCategoryLibraryContainService.selectLoctyList(); + } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java index da97daa..f86c567 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java @@ -4,12 +4,15 @@ import java.lang.reflect.Array; import java.lang.reflect.InvocationTargetException; import java.math.BigDecimal; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant; +import com.chinaunicom.zyhy.ebtp.supplier.base.service.impl.UserService; +import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo; import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType; import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo; @@ -37,6 +40,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { @Autowired private CoscoEvaluateTaskMapper coscoEvaluateTaskMapper; @Autowired + private UserService userService; + @Autowired private ICoscoEvaluateTemplateIndicatorNdService coscoEvaluateTemplateIndicatorNdService; @Autowired private CoscoEvaluateTaskSupplierMapper coscoEvaluateTaskSupplierMapper; @@ -102,6 +107,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { vo.setUserIds(new ArrayList<>(userIds)); list.add(vo); }); + addCoscoEvaluateTaskVo.setUserList(getUserList(coscoEvaluateTaskSupplierUsers)); addCoscoEvaluateTaskVo.setSupplierIds(list); List userNdTypeVos = coscoEvaluateTaskSupplierUserMapper.selectUserNdTypeList(id); Map> map = userNdTypeVos.stream() @@ -122,11 +128,29 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { addCoscoEvaluateTaskVo.setBlackSupplierVos(blackSupplierVos); addCoscoEvaluateTaskVo.setIndicatorList(vos); } catch (Exception e) { + e.printStackTrace(); throw new RuntimeException(e); } return addCoscoEvaluateTaskVo; } + private List getUserList(List coscoEvaluateTaskSupplierUsers) { + List user = userService.getUser(); + Map map = user.stream().collect(Collectors.toMap(UserVo::getUserId, userVo -> userVo)); + Map suUser = coscoEvaluateTaskSupplierUsers.stream() + .collect(Collectors.toMap( + CoscoEvaluateTaskSupplierUser::getUserId, + Function.identity(), + (existing, replacement) -> existing // 或者选择 replacement，决定保留哪个值 + )); + Map userMap = new HashMap<>(); + suUser.keySet().forEach(usa -> { + userMap.put(usa, map.get(usa)); + }); + return userMap.values().stream().collect(Collectors.toList()); + + } + /** * 查询【供应商评价_评价任务主表】列表 * @@ -208,7 +232,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { IPage p = new Page<>(taskListVo.getBasePageRequest().getPageNo(), taskListVo.getBasePageRequest().getPageSize()); IPage taskPageVoIPage = coscoEvaluateTaskMapper.selectTaskPage(p, taskListVo); - List deptIds=new ArrayList<>(); + List deptIds = new ArrayList<>(); taskPageVoIPage.getRecords().forEach(taskPageVo -> { deptIds.add(taskPageVo.getDeptId()); }); @@ -223,6 +247,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { /** * 任务提交 + * * @param addCoscoEvaluateTaskVo * @return */ @@ -243,7 +268,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { CoscoEvaluateTask coscoEvaluateTask = coscoEvaluateTaskMapper.selectByWorkFlowId(vo.getWorkFlowId()); coscoEvaluateTask.setApproveStatus(vo.getApproveStatus()); coscoEvaluateTaskMapper.updateCoscoEvaluateTask(coscoEvaluateTask); - ApproveVo aVo=new ApproveVo(); + ApproveVo aVo = new ApproveVo(); aVo.setResult(vo.getApproveStatus()); aVo.setCreateBy(coscoEvaluateTask.getCreateBy()); aVo.setDeptName("创建部门"); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/AddCoscoEvaluateTaskVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/AddCoscoEvaluateTaskVo.java index 4c1a710..3826827 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/AddCoscoEvaluateTaskVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/AddCoscoEvaluateTaskVo.java @@ -1,6 +1,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo; +import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTask; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskDeptWeight; @@ -38,4 +39,9 @@ public class AddCoscoEvaluateTaskVo extends CoscoEvaluateTask { */ private List taskDeptWeightList; + /** + * 用户信息列表 + */ + private List userList; + }