diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierUserConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierUserConstant.java index 16f7326..ac97870 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierUserConstant.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierUserConstant.java @@ -10,4 +10,8 @@ public interface SupplierUserConstant { public static final Long SCORE_STATUS_YD=1L; public static final String USER_NAME="admin"; + + public static final String DEPT_ID="dept001"; + + public static final String PARENT_DEPT_ID="dept002"; } 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 c4d2ece..135198b 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 @@ -2,6 +2,7 @@ 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.SelectUserVo; import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -21,8 +22,8 @@ public class UserController { @GetMapping("/getUserList") - public BaseResponse getUserList() { - return BaseResponse.success(userService.getUser()); + public BaseResponse getUserList(SelectUserVo vo) { + return BaseResponse.success(userService.getUser(vo.getUserIds())); } @GetMapping("/getDeptList") 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 index eb31066..37f97e3 100644 --- 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 @@ -4,7 +4,9 @@ import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Service public class UserService { @@ -21,15 +23,25 @@ public class UserService { } - public List getUser() { + public List getUser(List userIds) { List userList = new ArrayList<>(); + Map map = new HashMap<>(); + if(userIds!=null){ + for (String userId : userIds) { + map.put(userId,userId); + } + } 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轮换 + user.setUserDeptId("D" + ((i % 3) + 1)); + String s = map.get(user.getUserId()); + if(s!=null){ + user.setIsSelected(true); + } userList.add(user); } return userList; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/SelectUserVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/SelectUserVo.java new file mode 100644 index 0000000..cf6c021 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/SelectUserVo.java @@ -0,0 +1,10 @@ +package com.chinaunicom.zyhy.ebtp.supplier.base.vo; + +import lombok.Data; + +import java.util.List; + +@Data +public class SelectUserVo { + private List userIds; +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/UserVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/UserVo.java index d545666..c6801bc 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/UserVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/UserVo.java @@ -12,6 +12,8 @@ public class UserVo { * 用户id */ private String userId; + + private Boolean isSelected=false; /** * 用户部门 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/AnnualScheduledTasksServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/AnnualScheduledTasksServiceImpl.java index 42949ad..3c4aaf2 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/AnnualScheduledTasksServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/AnnualScheduledTasksServiceImpl.java @@ -1,6 +1,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.impl; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.AnnualreviewTaskConstant; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType; import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewScoringMapper; @@ -74,7 +75,7 @@ public class AnnualScheduledTasksServiceImpl implements AnnualScheduledTasksServ } }); coscoAnnualreviewTask.setStatus(AnnualreviewTaskConstant.COMPLETED); - coscoAnnualreviewTask.setUpdateBy("admin"); + coscoAnnualreviewTask.setUpdateBy(SupplierUserConstant.USER_NAME); coscoAnnualreviewTask.setUpdateTime(new Date()); coscoAnnualreviewTaskMapper.updateCoscoAnnualreviewTask(coscoAnnualreviewTask); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java index 6fadaaf..0688487 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java @@ -1,10 +1,13 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.impl; +import cn.hutool.system.UserInfo; 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.AnnualreviewTaskConstant; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; +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.coscoAnnualreview.dao.*; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.*; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.ICoscoAnnualreviewTaskService; @@ -12,14 +15,13 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AddTaskVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.CoscoAnnualreviewTaskListVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.SupplierPeopleVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskUserVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; /** @@ -42,6 +44,8 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS private CoscoAnnualreviewTemplateIndicatorMapper coscoAnnualreviewTemplateIndicatorMapper; @Autowired private CoscoSupplierBaseMapper coscoSupplierBaseMapper; + @Autowired + private UserService userService; /** * 查询供应商年审_年审任务主 @@ -51,6 +55,7 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS */ @Override public AddTaskVo selectCoscoAnnualreviewTaskById(String id) { + //获取基础信息 CoscoAnnualreviewTask coscoAnnualreviewTask = coscoAnnualreviewTaskMapper.selectCoscoAnnualreviewTaskById(id); AddTaskVo vo = new AddTaskVo(); vo.setId(coscoAnnualreviewTask.getId()); @@ -64,10 +69,27 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS List list = new ArrayList<>(); CoscoAnnualreviewTaskSupplier coscoAnnualreviewTaskSupplier = new CoscoAnnualreviewTaskSupplier(); coscoAnnualreviewTaskSupplier.setAnnualreviewTaskId(coscoAnnualreviewTask.getId()); + //获取添加供应商信息 List coscoAnnualreviewTaskSuppliers = coscoAnnualreviewTaskSupplierMapper.selectCoscoAnnualreviewTaskSupplierList(coscoAnnualreviewTaskSupplier); CoscoAnnualreviewTaskSupplierUser coscoAnnualreviewTaskSupplierUser = new CoscoAnnualreviewTaskSupplierUser(); coscoAnnualreviewTaskSupplierUser.setAnnualreviewTaskId(coscoAnnualreviewTask.getId()); + //获取供应商用户信息 List coscoAnnualreviewTaskSupplierUsers = coscoAnnualreviewTaskSupplierUserMapper.selectCoscoAnnualreviewTaskSupplierUserList(coscoAnnualreviewTaskSupplierUser); + //获取用户信息 + List user1 = userService.getUser(new ArrayList<>()); + //获取已使用的用户信息 + Map userIdMap = coscoAnnualreviewTaskSupplierUsers.stream() + .collect(Collectors. + toMap(CoscoAnnualreviewTaskSupplierUser::getUserId, + CoscoAnnualreviewTaskSupplierUser::getUserId, + (existing, replacement) -> existing)); + //获取全部用户信息 + Map userMap = user1.stream() + .collect(Collectors.toMap( + UserVo::getUserId, + user -> user, + (existing, replacement) -> existing // 当遇到重复 key 时保留已存在的值 + )); coscoAnnualreviewTaskSuppliers.forEach(supplier -> { SupplierPeopleVo user = new SupplierPeopleVo(); user.setSuppliedId(supplier.getSupplierId()); @@ -76,10 +98,29 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS .collect(Collectors.toList())); list.add(user); }); + Map> suppMap = list.stream().collect(Collectors.toMap(SupplierPeopleVo::getSuppliedId, SupplierPeopleVo::getUserIds)); List supplierIds = list.stream().map(SupplierPeopleVo::getSuppliedId).collect(Collectors.toList()); List blackSupplierVos = coscoSupplierBaseMapper.selectSupplierByIds(supplierIds); + List userInfo=userIdMap.keySet().stream().map(userId -> userMap.get(userId)).collect(Collectors.toList()); + blackSupplierVos.forEach(blackSupplierVo -> { + List taskUserVos = new ArrayList<>(); + List strings = suppMap.get(blackSupplierVo.getSupplierId()); + if(strings.size()>0){ + for (String userId : strings) { + TaskUserVo uVo=new TaskUserVo(); + UserVo userVo = userMap.get(userId); + uVo.setId(userId); + uVo.setName(userVo.getUserName()); + uVo.setUserDept(userVo.getUserDept()); + uVo.setUserDeptId(userVo.getUserDeptId()); + taskUserVos.add(uVo); + } + } + blackSupplierVo.setUserList(taskUserVos); + }); vo.setBlackSupplierVos(blackSupplierVos); vo.setSupplierPeopleVo(list); + vo.setUserList(userInfo); return vo; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AddTaskVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AddTaskVo.java index 6d10eb3..3d5c0dd 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AddTaskVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AddTaskVo.java @@ -1,5 +1,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo; +import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTask; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo; import lombok.Data; @@ -16,4 +17,8 @@ public class AddTaskVo extends CoscoAnnualreviewTask { * 供应商信息 */ private List blackSupplierVos; + /** + * 人员信息 + */ + private List userList; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackSupplierVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackSupplierVo.java index 4e6a4a0..9e42888 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackSupplierVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackSupplierVo.java @@ -1,9 +1,12 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskUserVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data public class BlackSupplierVo { @@ -15,6 +18,11 @@ public class BlackSupplierVo { * 供应商名称 */ private String supplierName; + + /** + * 社会信用代码 + */ + private String socialCreditCode; /** * 部门名称 */ @@ -26,15 +34,17 @@ public class BlackSupplierVo { /** * 准入物品名称 */ - private String categoryName; + private String categoryName; /** * 评价名称 */ - private String themeName; + private String themeName; /** * 评价时间 */ - private String evaluateTime; + private String evaluateTime; + + private List userList; @ApiModelProperty(value = "分页对象信息") private BasePageRequest basePageRequest; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierMapper.xml index 16206fe..1da8bbe 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierMapper.xml @@ -4,11 +4,12 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - + + + + + @@ -16,40 +17,47 @@ from cosco_category_library_supplier - - - and category_library_supplier_apply_id = #{categoryLibrarySupplierApplyId} - - - and category_library_id = #{categoryLibraryId} - - - and supplier_id = #{supplierId} - + + and category_library_supplier_apply_id = #{categoryLibrarySupplierApplyId} + + + and category_library_id = #{categoryLibraryId} + + + and supplier_id = #{supplierId} + - + insert into cosco_category_library_supplier - id, - category_library_supplier_apply_id, - category_library_id, - supplier_id, + id, + + category_library_supplier_apply_id, + + category_library_id, + supplier_id, - #{id}, - #{categoryLibrarySupplierApplyId}, - #{categoryLibraryId}, - #{supplierId}, + #{id}, + + #{categoryLibrarySupplierApplyId}, + + #{categoryLibraryId}, + #{supplierId}, @@ -60,24 +68,27 @@ ( #{item.id}, #{item.categoryLibrarySupplierApplyId}, #{item.categoryLibraryId}, #{item.supplierId}) - + update cosco_category_library_supplier - category_library_supplier_apply_id = - #{categoryLibrarySupplierApplyId}, - - category_library_id = - #{categoryLibraryId}, - - supplier_id = - #{supplierId}, - + + category_library_supplier_apply_id = + #{categoryLibrarySupplierApplyId}, + + category_library_id = + #{categoryLibraryId}, + + supplier_id = + #{supplierId}, + where id = #{id} - update cosco_category_library_supplier set del_flag = 2 + update cosco_category_library_supplier + set del_flag = 2 where id = #{id} @@ -90,8 +101,10 @@ 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 c359c20..cb14918 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 @@ -76,7 +76,7 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl selectCalculateAndObtainScores(String id); + /** + * 根据任务id删除 + * @param taskId + */ + void deleteByTaskId(String taskId); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskAssignDeptMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskAssignDeptMapper.java new file mode 100644 index 0000000..316fd6f --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskAssignDeptMapper.java @@ -0,0 +1,61 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao; + +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskAssignDept; + +import java.util.List; + +/** + * 供应商评价_分派下级单位完善评价人Mapper接口 + * + * @author ruoyi + * @date 2025-06-26 + */ +public interface CoscoEvaluateTaskAssignDeptMapper { + /** + * 查询供应商评价_分派下级单位完善评价人 + * + * @param id 供应商评价_分派下级单位完善评价人主键 + * @return 供应商评价_分派下级单位完善评价人 + */ + public CoscoEvaluateTaskAssignDept selectCoscoEvaluateTaskAssignDeptById(String id); + + /** + * 查询供应商评价_分派下级单位完善评价人列表 + * + * @param coscoEvaluateTaskAssignDept 供应商评价_分派下级单位完善评价人 + * @return 供应商评价_分派下级单位完善评价人集合 + */ + public List selectCoscoEvaluateTaskAssignDeptList(CoscoEvaluateTaskAssignDept coscoEvaluateTaskAssignDept); + + /** + * 新增供应商评价_分派下级单位完善评价人 + * + * @param coscoEvaluateTaskAssignDept 供应商评价_分派下级单位完善评价人 + * @return 结果 + */ + public int insertCoscoEvaluateTaskAssignDept(CoscoEvaluateTaskAssignDept coscoEvaluateTaskAssignDept); + + /** + * 修改供应商评价_分派下级单位完善评价人 + * + * @param coscoEvaluateTaskAssignDept 供应商评价_分派下级单位完善评价人 + * @return 结果 + */ + public int updateCoscoEvaluateTaskAssignDept(CoscoEvaluateTaskAssignDept coscoEvaluateTaskAssignDept); + + /** + * 删除供应商评价_分派下级单位完善评价人 + * + * @param id 供应商评价_分派下级单位完善评价人主键 + * @return 结果 + */ + public int deleteCoscoEvaluateTaskAssignDeptById(String id); + + /** + * 批量删除供应商评价_分派下级单位完善评价人 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteCoscoEvaluateTaskAssignDeptByIds(String[] ids); +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskDeptWeightMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskDeptWeightMapper.java index e44f0b2..d5fb032 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskDeptWeightMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskDeptWeightMapper.java @@ -64,4 +64,6 @@ public interface CoscoEvaluateTaskDeptWeightMapper { * @param list */ void batchCoscoEvaluateTaskDeptWeight(List list); + + void deleteByTaskId(String id); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskMapper.java index 10e5be7..a6fedcf 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskMapper.java @@ -5,6 +5,7 @@ import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTask; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTaskListVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.DivisionVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.NoTaskVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskPageVo; import io.lettuce.core.dynamic.annotation.Param; @@ -87,4 +88,11 @@ public interface CoscoEvaluateTaskMapper { * @return */ List selectNoTask(); + + /** + * 查询评价任务信息 + * @param taskListVo + * @return + */ + List selectDivisionVo(CoscoEvaluateTaskListVo taskListVo); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskUserIndicatorMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskUserIndicatorMapper.java index 07ec834..9491552 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskUserIndicatorMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskUserIndicatorMapper.java @@ -63,4 +63,10 @@ public interface CoscoEvaluateTaskUserIndicatorMapper { * @return 结果 */ public int deleteCoscoEvaluateTaskUserIndicatorByEvaluateTaskSupplierUserIds(String[] evaluateTaskSupplierUserIds); + + /** + * 根据任务id删除 + * @param taskId + */ + void deleteByTaskId(String taskId); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateScoringMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateScoringMapper.xml index f61a4d0..a772716 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateScoringMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateScoringMapper.xml @@ -156,6 +156,13 @@ #{id} + + delete + from cosco_evaluate_scoring + where evaluate_task_supplier_user_id in + (select id from cosco_evaluate_task_supplier_user where evaluate_task_id = #{taskId}) + + diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskAssignDeptMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskAssignDeptMapper.xml new file mode 100644 index 0000000..2a17f82 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskAssignDeptMapper.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + select id, evaluate_task_id, parent_dept_id, status + from cosco_evaluate_task_assign_dept + + + + + + + + insert into cosco_evaluate_task_assign_dept + + id, + evaluate_task_id, + parent_dept_id, + status, + + + #{id}, + #{evaluateTaskId}, + #{parentDeptId}, + #{status}, + + + + insert into cosco_evaluate_task_assign_dept + ( id, evaluate_task_id, parent_dept_id, status) + values + + ( #{item.id}, #{item.evaluateTaskId}, #{item.parentDeptId}, #{item.status}) + + + + update cosco_evaluate_task_assign_dept + + evaluate_task_id = + #{evaluateTaskId}, + + parent_dept_id = + #{parentDeptId}, + + status = + #{status}, + + + where id = #{id} + + + + update cosco_evaluate_task_assign_dept set del_flag = 2 + where id = #{id} + + + + update cosco_evaluate_task_assign_dept set del_flag = 2 where id in + + #{id} + + + diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskDeptWeightMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskDeptWeightMapper.xml index beec6ae..b2d8f14 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskDeptWeightMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskDeptWeightMapper.xml @@ -99,4 +99,7 @@ #{id} + + delete from cosco_evaluate_task_dept_weight where evaluate_task_id=#{taskId} + diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml index 98e322c..4f21e57 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml @@ -117,6 +117,26 @@ where cet.status = 0 and start_time <= now() + - diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml index eeba026..7959296 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml @@ -98,7 +98,7 @@ cets.create_time, cets.update_by, cets.update_time, - cc.category_name , + case when cc.category_name is null then '未指定' else cc.category_name end as category_name, cets.last_update_time, csb.name as supplier_name from cosco_evaluate_task_supplier cets @@ -131,7 +131,6 @@ and del_flag = 'normal' - and evaluate_task_id = #{evaluateTaskId} @@ -266,7 +265,8 @@ cet.evaluate_theme evaluateTheme, cet.start_time startTime, cet.end_time endTime, - cc.category_name as categoryName, + case when cc.category_name is null then '未指定' + else cc.category_name end as categoryName, cet.STATUS , cet.dept_id as deptId, cetsu.review_status reviewStatus, @@ -297,7 +297,7 @@ - update cosco_evaluate_task_supplier_user + update cosco_evaluate_task_supplier set del_flag = 'deleted' where evaluate_task_id = #{taskId} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskUserIndicatorMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskUserIndicatorMapper.xml index 4aa7180..79e90af 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskUserIndicatorMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskUserIndicatorMapper.xml @@ -66,4 +66,8 @@ #{evaluateTaskSupplierUserId} + + delete from cosco_evaluate_task_user_indicator where evaluate_task_supplier_user_id in + (select id from cosco_evaluate_task_supplier_user where evaluate_task_id = #{taskId}) + diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/entity/CoscoEvaluateTaskAssignDept.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/entity/CoscoEvaluateTaskAssignDept.java new file mode 100644 index 0000000..135b9a6 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/entity/CoscoEvaluateTaskAssignDept.java @@ -0,0 +1,30 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity; + + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import lombok.Data; + +/** + * 供应商评价_分派下级单位完善评价人对象 cosco_evaluate_task_assign_dept + * + * @author ruoyi + * @date 2025-06-26 + */ +@Data +public class CoscoEvaluateTaskAssignDept extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String id; + + /** 评价任务id(cosco_evaluate_task表主键) */ + private String evaluateTaskId; + + /** 上级本级部门ID */ + private String parentDeptId; + + /** 下派状态(0.本级截至、1.下派下级) */ + private Long status; + + +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ICoscoEvaluateTaskAssignDeptService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ICoscoEvaluateTaskAssignDeptService.java new file mode 100644 index 0000000..07aa0db --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ICoscoEvaluateTaskAssignDeptService.java @@ -0,0 +1,68 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service; + +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskAssignDept; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.AddCoscoEvaluateTaskVo; + +import java.util.List; + +/** + * 供应商评价_分派下级单位完善评价人Service接口 + * + * @author ruoyi + * @date 2025-06-26 + */ +public interface ICoscoEvaluateTaskAssignDeptService { + /** + * 查询供应商评价_分派下级单位完善评价人 + * + * @param id 供应商评价_分派下级单位完善评价人主键 + * @return 供应商评价_分派下级单位完善评价人 + */ + public CoscoEvaluateTaskAssignDept selectCoscoEvaluateTaskAssignDeptById(String id); + + /** + * 查询供应商评价_分派下级单位完善评价人列表 + * + * @param coscoEvaluateTaskAssignDept 供应商评价_分派下级单位完善评价人 + * @return 供应商评价_分派下级单位完善评价人集合 + */ + public List selectCoscoEvaluateTaskAssignDeptList(CoscoEvaluateTaskAssignDept coscoEvaluateTaskAssignDept); + + /** + * 新增供应商评价_分派下级单位完善评价人 + * + * @param coscoEvaluateTaskAssignDept 供应商评价_分派下级单位完善评价人 + * @return 结果 + */ + public int insertCoscoEvaluateTaskAssignDept(CoscoEvaluateTaskAssignDept coscoEvaluateTaskAssignDept); + + /** + * 修改供应商评价_分派下级单位完善评价人 + * + * @param coscoEvaluateTaskAssignDept 供应商评价_分派下级单位完善评价人 + * @return 结果 + */ + public int updateCoscoEvaluateTaskAssignDept(CoscoEvaluateTaskAssignDept coscoEvaluateTaskAssignDept); + + /** + * 批量删除供应商评价_分派下级单位完善评价人 + * + * @param ids 需要删除的供应商评价_分派下级单位完善评价人主键集合 + * @return 结果 + */ + public int deleteCoscoEvaluateTaskAssignDeptByIds(String[] ids); + + /** + * 删除供应商评价_分派下级单位完善评价人信息 + * + * @param id 供应商评价_分派下级单位完善评价人主键 + * @return 结果 + */ + public int deleteCoscoEvaluateTaskAssignDeptById(String id); + + /** + * 加入分派下级部门 + * @param addCoscoEvaluateTaskVo + */ + void insertAssignDept(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo); +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ICoscoEvaluateTaskService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ICoscoEvaluateTaskService.java index daffd97..cc6c34a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ICoscoEvaluateTaskService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ICoscoEvaluateTaskService.java @@ -101,4 +101,11 @@ public interface ICoscoEvaluateTaskService { * 供应商评价审核审批回调接口 */ ApproveVo evaluateApprove(AddCoscoEvaluateTaskVo vo); + + /** + * 增量人员分工添加 + * @param addCoscoEvaluateTaskVo + * @return + */ + int incrementalDivisionOfLaborAdditionAdd(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskAssignDeptServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskAssignDeptServiceImpl.java new file mode 100644 index 0000000..8c7f801 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskAssignDeptServiceImpl.java @@ -0,0 +1,104 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl; + + +import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateTaskAssignDeptMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskAssignDept; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskAssignDeptService; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.AddCoscoEvaluateTaskVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 供应商评价_分派下级单位完善评价人Service业务层处理 + * + * @author ruoyi + * @date 2025-06-26 + */ +@Service +public class CoscoEvaluateTaskAssignDeptServiceImpl implements ICoscoEvaluateTaskAssignDeptService { + @Autowired + private CoscoEvaluateTaskAssignDeptMapper coscoEvaluateTaskAssignDeptMapper; + + /** + * 查询供应商评价_分派下级单位完善评价人 + * + * @param id 供应商评价_分派下级单位完善评价人主键 + * @return 供应商评价_分派下级单位完善评价人 + */ + @Override + public CoscoEvaluateTaskAssignDept selectCoscoEvaluateTaskAssignDeptById(String id) { + return coscoEvaluateTaskAssignDeptMapper.selectCoscoEvaluateTaskAssignDeptById(id); + } + + /** + * 查询供应商评价_分派下级单位完善评价人列表 + * + * @param coscoEvaluateTaskAssignDept 供应商评价_分派下级单位完善评价人 + * @return 供应商评价_分派下级单位完善评价人 + */ + @Override + public List selectCoscoEvaluateTaskAssignDeptList(CoscoEvaluateTaskAssignDept coscoEvaluateTaskAssignDept) { + return coscoEvaluateTaskAssignDeptMapper.selectCoscoEvaluateTaskAssignDeptList(coscoEvaluateTaskAssignDept); + } + + /** + * 新增供应商评价_分派下级单位完善评价人 + * + * @param coscoEvaluateTaskAssignDept 供应商评价_分派下级单位完善评价人 + * @return 结果 + */ + @Override + public int insertCoscoEvaluateTaskAssignDept(CoscoEvaluateTaskAssignDept coscoEvaluateTaskAssignDept) { + return coscoEvaluateTaskAssignDeptMapper.insertCoscoEvaluateTaskAssignDept(coscoEvaluateTaskAssignDept); + } + + /** + * 修改供应商评价_分派下级单位完善评价人 + * + * @param coscoEvaluateTaskAssignDept 供应商评价_分派下级单位完善评价人 + * @return 结果 + */ + @Override + public int updateCoscoEvaluateTaskAssignDept(CoscoEvaluateTaskAssignDept coscoEvaluateTaskAssignDept) { + return coscoEvaluateTaskAssignDeptMapper.updateCoscoEvaluateTaskAssignDept(coscoEvaluateTaskAssignDept); + } + + /** + * 批量删除供应商评价_分派下级单位完善评价人 + * + * @param ids 需要删除的供应商评价_分派下级单位完善评价人主键 + * @return 结果 + */ + @Override + public int deleteCoscoEvaluateTaskAssignDeptByIds(String[] ids) { + return coscoEvaluateTaskAssignDeptMapper.deleteCoscoEvaluateTaskAssignDeptByIds(ids); + } + + /** + * 删除供应商评价_分派下级单位完善评价人信息 + * + * @param id 供应商评价_分派下级单位完善评价人主键 + * @return 结果 + */ + @Override + public int deleteCoscoEvaluateTaskAssignDeptById(String id) { + return coscoEvaluateTaskAssignDeptMapper.deleteCoscoEvaluateTaskAssignDeptById(id); + } + + @Override + public void insertAssignDept(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) { + CoscoEvaluateTaskAssignDept dept = new CoscoEvaluateTaskAssignDept(); + dept.setEvaluateTaskId(addCoscoEvaluateTaskVo.getId()); + dept.setParentDeptId(SupplierUserConstant.DEPT_ID); + List coscoEvaluateTaskAssignDepts = coscoEvaluateTaskAssignDeptMapper.selectCoscoEvaluateTaskAssignDeptList(dept); + if (coscoEvaluateTaskAssignDepts.size() == 0) { + dept.setId(PropertyUtils.getSnowflakeId()); + dept.setStatus(addCoscoEvaluateTaskVo.getTaskStatus()); + coscoEvaluateTaskAssignDeptMapper.insertCoscoEvaluateTaskAssignDept(dept); + } + } +} 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 cb75af0..8613860 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 @@ -12,6 +12,7 @@ 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.constant.EvaluateTaskConstant; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; 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; @@ -19,6 +20,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.*; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.*; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskAssignDeptService; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTemplateIndicatorNdService; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTemplateIndicatorStService; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.*; @@ -60,6 +62,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { @Autowired private CoscoEvaluateTaskDeptWeightMapper coscoEvaluateTaskDeptWeightMapper; + @Autowired + private ICoscoEvaluateTaskAssignDeptService coscoEvaluateTaskAssignDeptService; /** * 查询【供应商评价_评价任务主表】 @@ -121,17 +125,33 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { List userNdTypeVos1 = map.get(userId); vo.setType(userNdTypeVos1.get(0).getType()); - if(vo.getType()== EvaluateTaskConstant.INDICATOR_TYPE_ND_1){ + if (vo.getType() == EvaluateTaskConstant.INDICATOR_TYPE_ND_1) { List indicatorIds = userNdTypeVos1.stream().map(UserNdTypeVo::getNeId).collect(Collectors.toList()); vo.setIndicatorIds(indicatorIds); - }else{ + } else { vo.setIndicatorIds(new ArrayList<>()); } vos.add(vo); }); List supplierIds = list.stream().map(TaskSupplierVo::getId).collect(Collectors.toList()); + Map> suppMap = list.stream().collect(Collectors.toMap(TaskSupplierVo::getId, TaskSupplierVo::getUserIds,(existing, replacement) -> existing)); + Map userMap = userService.getUser(new ArrayList<>()).stream().collect(Collectors.toMap(UserVo::getUserId, userVo -> userVo)); List blackSupplierVos = coscoSupplierBaseMapper.selectSupplierByIds(supplierIds); + blackSupplierVos.forEach(blackSupplierVo -> { + List strings = suppMap.get(blackSupplierVo.getSupplierId()); + List taskUserVos = new ArrayList<>(); + strings.forEach(userId -> { + TaskUserVo vo = new TaskUserVo(); + vo.setId(userId); + vo.setName(userMap.get(userId).getUserName()); + vo.setUserDept(userMap.get(userId).getUserDept()); + vo.setUserDeptId(userMap.get(userId).getUserDeptId()); + vo.setSelected( true); + taskUserVos.add(vo); + }); + blackSupplierVo.setUserList(taskUserVos); + }); addCoscoEvaluateTaskVo.setBlackSupplierVos(blackSupplierVos); addCoscoEvaluateTaskVo.setIndicatorList(vos); } catch (Exception e) { @@ -142,7 +162,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { } private List getUserList(List coscoEvaluateTaskSupplierUsers) { - List user = userService.getUser(); + List user = userService.getUser(new ArrayList<>()); Map map = user.stream().collect(Collectors.toMap(UserVo::getUserId, userVo -> userVo)); Map suUser = coscoEvaluateTaskSupplierUsers.stream() .collect(Collectors.toMap( @@ -152,7 +172,9 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { )); Map userMap = new HashMap<>(); suUser.keySet().forEach(usa -> { - userMap.put(usa, map.get(usa)); + UserVo userVo = map.get(usa); + userVo.setIsSelected(true); + userMap.put(usa, userVo); }); return userMap.values().stream().collect(Collectors.toList()); @@ -225,7 +247,18 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { public IPage getPage(CoscoEvaluateTaskListVo taskListVo) { IPage p = new Page<>(taskListVo.getBasePageRequest().getPageNo(), taskListVo.getBasePageRequest().getPageSize()); - return coscoEvaluateTaskMapper.selectMyPage(p, taskListVo); + IPage coscoEvaluateTaskListVoIPage = coscoEvaluateTaskMapper.selectMyPage(p, taskListVo); + List taskIds = coscoEvaluateTaskListVoIPage.getRecords().stream().map(CoscoEvaluateTaskListVo::getId).collect(Collectors.toList()); + taskListVo.setDeptId(SupplierUserConstant.DEPT_ID); + taskListVo.setTaskIds(taskIds); + taskListVo.setParentDeptId(SupplierUserConstant.PARENT_DEPT_ID); + List vos = coscoEvaluateTaskMapper.selectDivisionVo(taskListVo); + Map map = vos.stream().collect(Collectors.toMap(DivisionVo::getTaskId, DivisionVo::getDivision)); + coscoEvaluateTaskListVoIPage.getRecords().forEach(task -> { + task.setIsEditor(task.getDeptId().equals(taskListVo.getDeptId()) ? "1" : "0"); + task.setDivision(map.get(task.getId()) == null ? "2" : map.get(task.getId())); + }); + return coscoEvaluateTaskListVoIPage; } /** @@ -288,6 +321,14 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { return aVo; } + @Override + public int incrementalDivisionOfLaborAdditionAdd(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) { + addCoscoEvaluateTaskVo.setDeptId(SupplierUserConstant.DEPT_ID); + deleteAll(addCoscoEvaluateTaskVo); + addEvalTaskInfo(addCoscoEvaluateTaskVo); + return 0; + } + /** * 添加任务 * @@ -303,99 +344,10 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { addCoscoEvaluateTaskVo(addCoscoEvaluateTaskVo); } else { updateCoscoEvaluateTask(addCoscoEvaluateTaskVo); - coscoEvaluateTaskSupplierMapper.deleteByTaskId(addCoscoEvaluateTaskVo.getId()); - coscoEvaluateTaskSupplierUserMapper.deleteByTaskId(addCoscoEvaluateTaskVo.getId()); + } + deleteAll(addCoscoEvaluateTaskVo); - } - /** - * 权重信息添加 - */ - List taskDeptWeightList = addCoscoEvaluateTaskVo.getTaskDeptWeightList(); - if (taskDeptWeightList.size() > 0) { - taskDeptWeightList.forEach(taskDeptWeight -> { - taskDeptWeight.setId(PropertyUtils.getSnowflakeId()); - taskDeptWeight.setEvaluateTaskId(addCoscoEvaluateTaskVo.getId()); - taskDeptWeight.setCreateTime(new Date()); - }); - coscoEvaluateTaskDeptWeightMapper.batchCoscoEvaluateTaskDeptWeight(taskDeptWeightList); - } - //供应商信息添加 - List supplierIds1 = addCoscoEvaluateTaskVo.getSupplierIds(); - Map> supplierUserIds = new HashMap<>(); - List supplierIds = new ArrayList<>(); - for (TaskSupplierVo supplierId : supplierIds1) { - supplierIds.add(supplierId.getId()); - supplierUserIds.put(supplierId.getId(), supplierId.getUserIds()); - } - List list = new ArrayList<>(); - for (String supplierId : supplierIds) { - CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier = new CoscoEvaluateTaskSupplier(); - coscoEvaluateTaskSupplier.setId(PropertyUtils.getSnowflakeId()); - coscoEvaluateTaskSupplier.setEvaluateTaskId(addCoscoEvaluateTaskVo.getId()); - coscoEvaluateTaskSupplier.setSupplierId(supplierId); - coscoEvaluateTaskSupplier.setCreateTime(new Date()); - coscoEvaluateTaskSupplier.setUpdateTime(new Date()); - coscoEvaluateTaskSupplier.setCreateBy("admin"); - coscoEvaluateTaskSupplier.setUpdateBy("admin"); - list.add(coscoEvaluateTaskSupplier); - } - Map> map = new HashMap<>(); - //获取模板所有二级项 - CoscoEvaluateTemplateIndicatorNd nd = new CoscoEvaluateTemplateIndicatorNd(); - nd.setTemplateId(addCoscoEvaluateTaskVo.getTemplateId()); - List coscoEvaluateTemplateIndicatorNds = - coscoEvaluateTemplateIndicatorNdService.selectCoscoEvaluateTemplateIndicatorNdList(nd); - //匹配人员一级项和二级项 - //获取人员选择 - List indicatorList = addCoscoEvaluateTaskVo.getIndicatorList(); - Map invoices = new HashMap<>(); - indicatorList.forEach(indicatorVo -> { - adduserMap(map, indicatorVo, coscoEvaluateTemplateIndicatorNds); - invoices.put(indicatorVo.getUserId(), indicatorVo); - }); - //获取项目添加人员 - //人员二级项添加列表 - List coscoEvaluateScorings = new ArrayList<>(); - //人员添加列表 - List coscoEvaluateTaskSupplierUsers = new ArrayList<>(); - //人员一级项添加列表 - List coscoEvaluateTaskSupplierUserIndicators = new ArrayList<>(); - supplierUserIds.keySet().stream().forEach(supplierId -> { - List strings = supplierUserIds.get(supplierId); - strings.forEach(userId -> { - CoscoEvaluateTaskSupplierUser user = new CoscoEvaluateTaskSupplierUser(); - user.setId(PropertyUtils.getSnowflakeId()); - user.setEvaluateTaskId(addCoscoEvaluateTaskVo.getId()); - user.setSupplierId(supplierId); - user.setUserId(userId); - user.setType(invoices.get(userId).getType()); - user.setCreateTime(new Date()); - user.setUpdateTime(new Date()); - user.setCreateBy("admin"); - user.setUpdateBy("admin"); - coscoEvaluateTaskSupplierUsers.add(user); - map.get(userId).forEach(indicatorId -> { - CoscoEvaluateTaskUserIndicator indicator = new CoscoEvaluateTaskUserIndicator(); - indicator.setIndicatorNdId(indicatorId); - indicator.setEvaluateTaskSupplierUserId(user.getId()); - coscoEvaluateTaskSupplierUserIndicators.add(indicator); - CoscoEvaluateScoring coscoEvaluateScoring = new CoscoEvaluateScoring(); - coscoEvaluateScoring.setId(PropertyUtils.getSnowflakeId()); - coscoEvaluateScoring.setEvaluateTaskSupplierUserId(user.getId()); - coscoEvaluateScoring.setIndicatorNdId(indicatorId); - coscoEvaluateScoring.setCreateTime(new Date()); - coscoEvaluateScoring.setUpdateTime(new Date()); - coscoEvaluateScoring.setCreateBy("admin"); - coscoEvaluateScoring.setUpdateBy("admin"); - coscoEvaluateScorings.add(coscoEvaluateScoring); - }); - }); - }); - - coscoEvaluateTaskSupplierMapper.batchCoscoEvaluateTaskSupplier(list); - coscoEvaluateScoringMapper.batchCoscoEvaluateScoring(coscoEvaluateScorings); - coscoEvaluateTaskSupplierUserMapper.batchCoscoEvaluateTaskSupplierUser(coscoEvaluateTaskSupplierUsers); - coscoEvaluateTaskUserIndicatorMapper.batchCoscoEvaluateTaskUserIndicator(coscoEvaluateTaskSupplierUserIndicators); + addEvalTaskInfo(addCoscoEvaluateTaskVo); } catch (Exception e) { e.printStackTrace(); throw new RuntimeException(e); @@ -403,12 +355,119 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { return 1; } + private void deleteAll(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) { + coscoEvaluateTaskSupplierMapper.deleteByTaskId(addCoscoEvaluateTaskVo.getId()); + coscoEvaluateTaskSupplierUserMapper.deleteByTaskId(addCoscoEvaluateTaskVo.getId()); + coscoEvaluateScoringMapper.deleteByTaskId(addCoscoEvaluateTaskVo.getId()); + coscoEvaluateTaskUserIndicatorMapper.deleteByTaskId(addCoscoEvaluateTaskVo.getId()); + coscoEvaluateTaskDeptWeightMapper.deleteByTaskId(addCoscoEvaluateTaskVo.getId()); + } + + private void addEvalTaskInfo(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) { + /** + * 权重信息添加 + */ + List taskDeptWeightList = addCoscoEvaluateTaskVo.getTaskDeptWeightList(); + if (taskDeptWeightList.size() > 0) { + taskDeptWeightList.forEach(taskDeptWeight -> { + taskDeptWeight.setId(PropertyUtils.getSnowflakeId()); + taskDeptWeight.setEvaluateTaskId(addCoscoEvaluateTaskVo.getId()); + taskDeptWeight.setCreateTime(new Date()); + }); + coscoEvaluateTaskDeptWeightMapper.batchCoscoEvaluateTaskDeptWeight(taskDeptWeightList); + } + //供应商信息添加 + List supplierIds1 = addCoscoEvaluateTaskVo.getSupplierIds(); + Map> supplierUserIds = new HashMap<>(); + List supplierIds = new ArrayList<>(); + for (TaskSupplierVo supplierId : supplierIds1) { + supplierIds.add(supplierId.getId()); + supplierUserIds.put(supplierId.getId(), supplierId.getUserIds()); + } + List list = new ArrayList<>(); + for (String supplierId : supplierIds) { + CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier = new CoscoEvaluateTaskSupplier(); + coscoEvaluateTaskSupplier.setId(PropertyUtils.getSnowflakeId()); + coscoEvaluateTaskSupplier.setEvaluateTaskId(addCoscoEvaluateTaskVo.getId()); + coscoEvaluateTaskSupplier.setSupplierId(supplierId); + coscoEvaluateTaskSupplier.setCreateTime(new Date()); + coscoEvaluateTaskSupplier.setUpdateTime(new Date()); + coscoEvaluateTaskSupplier.setCreateBy(SupplierUserConstant.USER_NAME); + coscoEvaluateTaskSupplier.setUpdateBy(SupplierUserConstant.USER_NAME); + list.add(coscoEvaluateTaskSupplier); + } + Map> map = new HashMap<>(); + //获取模板所有二级项 + CoscoEvaluateTemplateIndicatorNd nd = new CoscoEvaluateTemplateIndicatorNd(); + nd.setTemplateId(addCoscoEvaluateTaskVo.getTemplateId()); + List coscoEvaluateTemplateIndicatorNds = + coscoEvaluateTemplateIndicatorNdService.selectCoscoEvaluateTemplateIndicatorNdList(nd); + //匹配人员一级项和二级项 + //获取人员选择 + List indicatorList = addCoscoEvaluateTaskVo.getIndicatorList(); + Map invoices = new HashMap<>(); + indicatorList.forEach(indicatorVo -> { + adduserMap(map, indicatorVo, coscoEvaluateTemplateIndicatorNds); + invoices.put(indicatorVo.getUserId(), indicatorVo); + }); + //获取项目添加人员 + //人员二级项添加列表 + List coscoEvaluateScorings = new ArrayList<>(); + //人员添加列表 + List coscoEvaluateTaskSupplierUsers = new ArrayList<>(); + //人员一级项添加列表 + List coscoEvaluateTaskSupplierUserIndicators = new ArrayList<>(); + supplierUserIds.keySet().stream().forEach(supplierId -> { + List strings = supplierUserIds.get(supplierId); + strings.forEach(userId -> { + CoscoEvaluateTaskSupplierUser user = new CoscoEvaluateTaskSupplierUser(); + user.setId(PropertyUtils.getSnowflakeId()); + user.setEvaluateTaskId(addCoscoEvaluateTaskVo.getId()); + user.setSupplierId(supplierId); + user.setUserId(userId); + user.setType(invoices.get(userId).getType()); + user.setCreateTime(new Date()); + user.setUpdateTime(new Date()); + user.setCreateBy(SupplierUserConstant.USER_NAME); + user.setUpdateBy(SupplierUserConstant.USER_NAME); + coscoEvaluateTaskSupplierUsers.add(user); + map.get(userId).forEach(indicatorId -> { + CoscoEvaluateTaskUserIndicator indicator = new CoscoEvaluateTaskUserIndicator(); + indicator.setIndicatorNdId(indicatorId); + indicator.setEvaluateTaskSupplierUserId(user.getId()); + coscoEvaluateTaskSupplierUserIndicators.add(indicator); + CoscoEvaluateScoring coscoEvaluateScoring = new CoscoEvaluateScoring(); + coscoEvaluateScoring.setId(PropertyUtils.getSnowflakeId()); + coscoEvaluateScoring.setEvaluateTaskSupplierUserId(user.getId()); + coscoEvaluateScoring.setIndicatorNdId(indicatorId); + coscoEvaluateScoring.setCreateTime(new Date()); + coscoEvaluateScoring.setUpdateTime(new Date()); + coscoEvaluateScoring.setCreateBy(SupplierUserConstant.USER_NAME); + coscoEvaluateScoring.setUpdateBy(SupplierUserConstant.USER_NAME); + coscoEvaluateScorings.add(coscoEvaluateScoring); + }); + }); + }); + + coscoEvaluateTaskSupplierMapper.batchCoscoEvaluateTaskSupplier(list); + coscoEvaluateScoringMapper.batchCoscoEvaluateScoring(coscoEvaluateScorings); + coscoEvaluateTaskSupplierUserMapper.batchCoscoEvaluateTaskSupplierUser(coscoEvaluateTaskSupplierUsers); + coscoEvaluateTaskUserIndicatorMapper.batchCoscoEvaluateTaskUserIndicator(coscoEvaluateTaskSupplierUserIndicators); + /** + * 添加评价是否可以下级提交 + */ + if (addCoscoEvaluateTaskVo.getTaskStatus() != null) { + coscoEvaluateTaskAssignDeptService.insertAssignDept(addCoscoEvaluateTaskVo); + } + } + private void addCoscoEvaluateTaskVo(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) { addCoscoEvaluateTaskVo.setCreateTime(new Date()); addCoscoEvaluateTaskVo.setUpdateTime(new Date()); addCoscoEvaluateTaskVo.setId(PropertyUtils.getSnowflakeId()); - addCoscoEvaluateTaskVo.setCreateBy("admin"); - addCoscoEvaluateTaskVo.setUpdateBy("admin"); + addCoscoEvaluateTaskVo.setCreateBy(SupplierUserConstant.USER_NAME); + addCoscoEvaluateTaskVo.setUpdateBy(SupplierUserConstant.USER_NAME); + addCoscoEvaluateTaskVo.setDeptId(SupplierUserConstant.PARENT_DEPT_ID); coscoEvaluateTaskMapper.insertCoscoEvaluateTask(addCoscoEvaluateTaskVo); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java index fdf698c..2b5b2bc 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java @@ -3,6 +3,8 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.EvaluateTaskConstant; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageConstant; +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.service.ICoscoBlacklistService; @@ -45,6 +47,8 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService { private ICoscoBlacklistService coscoBlacklistService; @Autowired private CoscoMessageMapper coscoMessageMapper; + @Autowired + private UserService userService; /** * 定时任务查看待开启的任务。如果时间小于当前时间那么开启任务 @@ -52,7 +56,7 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService { @Scheduled(cron = "0 0 1 * * ?") @MessageLog(messageType = MessageType.MESSAGETYPE_GYSJY) public List checkTask() { - List noTasks =coscoEvaluateTaskMapper.selectNoTask(); + List noTasks = coscoEvaluateTaskMapper.selectNoTask(); //查询小于当前时间 未开启任务 coscoEvaluateTaskMapper.updateNOTask(); return noTasks; @@ -78,6 +82,14 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService { List coscoEvaluateTaskSuppliers = coscoEvaluateTaskSupplierMapper.selectCoscoEvaluateTaskSupplierList(suppliers); //查询当前任务的人员信息及人员评价情况 List calculateAndObtainScoresVos = coscoEvaluateScoringMapper.selectCalculateAndObtainScores(coscoEvaluateTask.getId()); + //获取人员信息 + List user = userService.getUser(new ArrayList<>()); + //给人员添加部门信息 + Map userMap = user.stream().collect(Collectors.toMap(UserVo::getUserId, UserVo::getUserDeptId)); + calculateAndObtainScoresVos.forEach(vos -> { + vos.setDeptId(userMap.get(vos.getUserId())); + }); + //返回集合 List coscoEvaluateScoringResults = new ArrayList<>(); coscoEvaluateTaskSuppliers.forEach(coscoEvaluateTaskSupplier -> { //计算总分数 @@ -106,6 +118,15 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService { } + /** + * 计算分数 + * + * @param calculateAndObtainScoresVos + * @param coscoEvaluateTaskSupplier + * @param coscoEvaluateScoringResults + * @param coscoEvaluateTaskDeptWeightes + * @return + */ private static int getCalculateScore(List calculateAndObtainScoresVos, CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier, List coscoEvaluateScoringResults, List coscoEvaluateTaskDeptWeightes) { //基础百分比 int basePercentage = 100; @@ -135,7 +156,9 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService { int noWeightDeptListI = 0; BigDecimal hundred = BigDecimal.valueOf(100); for (String deptId : groupedByDeptId.keySet()) { + //判断是否添加权重 BigDecimal bigDecimal = map.get(deptId); + //获取部门打分项信息 List calculateAndObtainScoresVos1 = groupedByDeptId.get(deptId); if (bigDecimal != null) { if (calculateAndObtainScoresVos1 != null) { @@ -156,13 +179,16 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService { } } } + //计算非权重部门的打分 BigDecimal divide = noWeightScore .divide(BigDecimal.valueOf(noWeightDeptListI), 2, BigDecimal.ROUND_HALF_UP) .multiply(new BigDecimal(basePercentage)).divide(hundred, 2, BigDecimal.ROUND_HALF_UP); + //计算分数总和 indicatorScore = weightScore.add(divide).doubleValue(); } else { + //获取没有权重的打分信息 int sScore = indicatorList.stream().mapToInt(CalculateAndObtainScoresVo::getScore).sum(); - indicatorScore = sScore / indicatorList.size(); + indicatorScore = (double) sScore / indicatorList.size(); } addResults(coscoEvaluateTaskSupplier, coscoEvaluateScoringResults, id, indicatorScore); totalScore += indicatorScore; @@ -170,6 +196,13 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService { return totalScore.intValue(); } + /** + * 添加结果 + * @param coscoEvaluateTaskSupplier + * @param coscoEvaluateScoringResults + * @param id + * @param indicatorScore + */ private static void addResults(CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier, List coscoEvaluateScoringResults, String id, double indicatorScore) { @@ -192,11 +225,11 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService { List becomeDueVos = coscoBlacklistService.selectBecomeDue(); List coscoMessages = new ArrayList<>(); //添加消息 - becomeDueVos.forEach(becomeDueVo ->{ + becomeDueVos.forEach(becomeDueVo -> { CoscoMessage coscoMessage = new CoscoMessage(); coscoMessage.setId(PropertyUtils.getSnowflakeId()); coscoMessage.setReceiverId(becomeDueVo.getCreater()); - coscoMessage.setContent("您准入的"+becomeDueVo.getName()+"供应商黑名单时效到期，请及时提交解除申请："); + coscoMessage.setContent("您准入的" + becomeDueVo.getName() + "供应商黑名单时效到期，请及时提交解除申请："); coscoMessage.setType(MessageConstant.BLACKLIST_EXPIRE); coscoMessage.setCreateTime(new Date()); coscoMessage.setUpdateTime(new Date()); 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 3826827..0dad131 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 @@ -4,6 +4,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.CoscoEvaluateTaskAssignDept; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskDeptWeight; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -43,5 +44,9 @@ public class AddCoscoEvaluateTaskVo extends CoscoEvaluateTask { * 用户信息列表 */ private List userList; + /** + * 是否下级部门可以添加评价信息 + */ + private Long taskStatus; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/AdduserIndicatorVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/AdduserIndicatorVo.java index a00462e..e386b6e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/AdduserIndicatorVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/AdduserIndicatorVo.java @@ -14,6 +14,7 @@ public class AdduserIndicatorVo { * 评价类型(0 按评价单 1 按指标) */ private Long type=0L; + private Boolean isSelected=true; /** * 指标id集合 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java index a0ad631..9b4f877 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +import java.util.List; @Data public class CoscoEvaluateTaskListVo { @@ -62,6 +63,22 @@ public class CoscoEvaluateTaskListVo { * 审批状态名称 */ private String approveStatusName; + /** + * 父类部门id + */ + private String parentDeptId; + /** + * 是否编辑 + */ + private String isEditor; + /** + * 显示分工 + */ + private String division; + + private List taskIds; + + @ApiModelProperty(value = "分页对象信息") private BasePageRequest basePageRequest; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/DivisionVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/DivisionVo.java new file mode 100644 index 0000000..7246211 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/DivisionVo.java @@ -0,0 +1,9 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo; + +import lombok.Data; + +@Data +public class DivisionVo { + private String taskId; + private String division; +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskUserVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskUserVo.java new file mode 100644 index 0000000..b579547 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskUserVo.java @@ -0,0 +1,32 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo; + +import lombok.Data; + +@Data +public class TaskUserVo { + /** + * 人员ID + */ + private String id; + /** + * 人员姓名 + */ + private String name; + /** + * 所属部门 + */ + private String userDept; + /** + * 所属部门ID + */ + private String userDeptId; + /** + * 职位 + */ + private String position; + /** + * 是否被选中（用于UI显示） + */ + private Boolean selected=true; + +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java index 67cee2a..6e7051e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java @@ -49,6 +49,8 @@ public class SupplierPageVo { */ private List deptList; + private String socialCreditCode; + @ApiModelProperty(value = "分页对象信息") private BasePageRequest basePageRequest; } diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml index 5de9b8c..d308d17 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml @@ -624,6 +624,7 @@ SELECT csb.id, MAX(csb.name) AS name, + csb.social_credit_code AS socialCreditCode, MAX(cas.dept_id) AS deptId, MAX(caw.id) AS accessWorkId, MAX(caw.update_time) AS admissionTime, @@ -715,6 +716,7 @@ SELECT csb.id AS supplierId, csb.name AS supplierName, + csb.social_credit_code as socialCreditCode, '准入部门' AS deptName, category_info.categoryName AS categoryName, work_time.createTime AS createTime,