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 eb1d5b5..740fce8 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 @@ -11,10 +11,6 @@ public final class 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/service/IUserService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IUserService.java index 2ae90a4..0ff6b84 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IUserService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IUserService.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.common.base.entity.SysUser; import com.chinaunicom.mall.ebtp.common.base.entity.SysUserVO; +import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo; +import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo; import java.util.List; @@ -19,4 +21,6 @@ public interface IUserService{ BaseResponse> getUserList(SysUser vo); + + List getUser(SelectUserVo vo); } 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 8160276..33e693c 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 @@ -82,7 +82,6 @@ public class AnnualScheduledTasksServiceImpl implements AnnualScheduledTasksServ }); //修改任务状态 coscoAnnualreviewTask.setStatus(AnnualreviewTaskConstant.COMPLETED); - 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 dbc42f0..4a059d9 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 @@ -2,10 +2,11 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; +import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; 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.UserServiceImpl; +import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService; import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo; import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.*; @@ -45,7 +46,7 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS @Autowired private CoscoSupplierBaseMapper coscoSupplierBaseMapper; @Autowired - private UserServiceImpl userService; + private IUserService userService; /** * 查询供应商年审_年审任务主 @@ -103,20 +104,24 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS 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()); + 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.isEmpty()){ + if (!strings.isEmpty()) { for (String userId : strings) { - TaskUserVo uVo=new TaskUserVo(); + TaskUserVo uVo = new TaskUserVo(); UserVo userVo = userMap.get(userId); uVo.setId(userId); - uVo.setName(userVo.getUserName()); - uVo.setUserDept(userVo.getUserDept()); - uVo.setUserDeptId(userVo.getUserDeptId()); + if (userVo != null) { + uVo.setName(userVo.getUserName()); + uVo.setUserDept(userVo.getUserDept()); + uVo.setUserDeptId(userVo.getUserDeptId()); + + } taskUserVos.add(uVo); + } } blackSupplierVo.setUserList(taskUserVos); @@ -149,9 +154,11 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS public int insertCoscoAnnualreviewTask(AddTaskVo taskVo) { taskVo.setCreateTime(new Date()); taskVo.setUpdateTime(new Date()); - taskVo.setUpdateBy(SupplierUserConstant.USER_NAME); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + String userId = currentUser.getUserId(); + taskVo.setUpdateBy(userId); taskVo.setId(PropertyUtils.getSnowflakeId()); - taskVo.setCreateBy(SupplierUserConstant.USER_NAME); + taskVo.setCreateBy(userId); taskVo.setStatus(AnnualreviewTaskConstant.NOT_START); coscoAnnualreviewTaskMapper.insertCoscoAnnualreviewTask(taskVo); addList(taskVo); @@ -171,16 +178,17 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS List scoringList = new ArrayList<>(); List taskSupplierList = new ArrayList<>(); List taskSupplierUserList = new ArrayList<>(); - Date date =new Date(); + Date date = new Date(); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); supplierPeopleVo.forEach(vo -> { //添加供应商信息 CoscoAnnualreviewTaskSupplier taskSupplier = new CoscoAnnualreviewTaskSupplier(); taskSupplier.setId(PropertyUtils.getSnowflakeId()); taskSupplier.setAnnualreviewTaskId(taskVo.getId()); taskSupplier.setSupplierId(vo.getSuppliedId()); - taskSupplier.setCreateBy(SupplierUserConstant.USER_NAME); + taskSupplier.setCreateBy(currentUser.getUserId()); taskSupplier.setCreateTime(date); - taskSupplier.setUpdateBy(SupplierUserConstant.USER_NAME); + taskSupplier.setUpdateBy(currentUser.getUserId()); taskSupplier.setUpdateTime(date); taskSupplierList.add(taskSupplier); List userIds = vo.getUserIds(); @@ -191,9 +199,9 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS taskSupplierUser.setAnnualreviewTaskId(taskVo.getId()); taskSupplierUser.setSupplierId(vo.getSuppliedId()); taskSupplierUser.setUserId(userId); - taskSupplierUser.setCreateBy(SupplierUserConstant.USER_NAME); + taskSupplierUser.setCreateBy(currentUser.getUserId()); taskSupplierUser.setCreateTime(date); - taskSupplierUser.setUpdateBy(SupplierUserConstant.USER_NAME); + taskSupplierUser.setUpdateBy(currentUser.getUserId()); taskSupplierUser.setReviewStatus(AnnualreviewTaskConstant.WAIT_APPROVE); taskSupplierUser.setUpdateTime(date); taskSupplierUserList.add(taskSupplierUser); @@ -203,9 +211,9 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS scoring.setId(PropertyUtils.getSnowflakeId()); scoring.setAnnualreviewTaskSupplierUserId(taskSupplierUser.getId()); scoring.setTemplateItemId(ind.getId()); - scoring.setCreateBy(SupplierUserConstant.USER_NAME); + scoring.setCreateBy(currentUser.getUserId()); scoring.setCreateTime(date); - scoring.setUpdateBy(SupplierUserConstant.USER_NAME); + scoring.setUpdateBy(currentUser.getUserId()); scoring.setUpdateTime(date); scoringList.add(scoring); }); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java index af34c10..0adc3e3 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java @@ -2,6 +2,8 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; +import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.AnnualreviewTaskConstant; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewScoringMapper; @@ -60,9 +62,10 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua AnnualreviewTaskSupplierUserInfoVo vo = new AnnualreviewTaskSupplierUserInfoVo(); vo.setId(id); vo.setName(baseCategoryNameVo.getName()); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); vo.setDeptName(SupplierUserConstant.CREATE_DEPT); vo.setThemName(coscoAnnualreviewTask.getAnnualreviewTheme()); - vo.setReviewerName(SupplierUserConstant.USER_NAME); + vo.setReviewerName(currentUser.getUserId()); vo.setStartTime(coscoAnnualreviewTask.getStartTime()); vo.setEndTime(coscoAnnualreviewTask.getEndTime()); vo.setCategory(baseCategoryNameVo.getCategoryName()); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateIndicatorServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateIndicatorServiceImpl.java index aee995d..a0f96f6 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateIndicatorServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateIndicatorServiceImpl.java @@ -3,6 +3,8 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.impl; import java.util.Date; import java.util.List; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; +import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AddCoscoAnnualreviewTemplateVo; @@ -105,13 +107,14 @@ public class CoscoAnnualreviewTemplateIndicatorServiceImpl implements ICoscoAnnu Date date=new Date(); //添加二级指标 List indicatorList = coscoAnnualreviewTemplate.getIndicatorList(); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); for (CoscoAnnualreviewTemplateIndicator coscoAnnualreviewTemplateIndicator : indicatorList) { coscoAnnualreviewTemplateIndicator.setCreateTime(date); coscoAnnualreviewTemplateIndicator.setUpdateTime(date); - coscoAnnualreviewTemplateIndicator.setUpdateBy(SupplierUserConstant.USER_NAME); + coscoAnnualreviewTemplateIndicator.setUpdateBy(currentUser.getUserId()); coscoAnnualreviewTemplateIndicator.setTemplateId(coscoAnnualreviewTemplate.getId()); coscoAnnualreviewTemplateIndicator.setId(PropertyUtils.getSnowflakeId()); - coscoAnnualreviewTemplateIndicator.setCreateBy(SupplierUserConstant.USER_NAME); + coscoAnnualreviewTemplateIndicator.setCreateBy(currentUser.getUserId()); } coscoAnnualreviewTemplateIndicatorMapper.batchCoscoAnnualreviewTemplateIndicator(indicatorList); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java index d2d8f4f..976768a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java @@ -2,6 +2,8 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; +import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ReviewTemplateConstant; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; @@ -69,11 +71,12 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT */ @Override public int insertCoscoAnnualreviewTemplate(AddCoscoAnnualreviewTemplateVo coscoAnnualreviewTemplate) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); coscoAnnualreviewTemplate.setCreateTime(new Date()); coscoAnnualreviewTemplate.setUpdateTime(new Date()); - coscoAnnualreviewTemplate.setUpdateBy(SupplierUserConstant.USER_NAME); + coscoAnnualreviewTemplate.setUpdateBy(currentUser.getUserId()); coscoAnnualreviewTemplate.setId(PropertyUtils.getSnowflakeId()); - coscoAnnualreviewTemplate.setCreateBy(SupplierUserConstant.USER_NAME); + coscoAnnualreviewTemplate.setCreateBy(currentUser.getUserId()); coscoAnnualreviewTemplateMapper.insertCoscoAnnualreviewTemplate(coscoAnnualreviewTemplate); coscoAnnualreviewTemplateIndicatorService.batchInsertCoscoAnnualreviewTemplateIndicator(coscoAnnualreviewTemplate); return 1; @@ -87,8 +90,9 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT */ @Override public int updateCoscoAnnualreviewTemplate(AddCoscoAnnualreviewTemplateVo coscoAnnualreviewTemplate) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); coscoAnnualreviewTemplate.setUpdateTime(new Date()); - coscoAnnualreviewTemplate.setUpdateBy(SupplierUserConstant.USER_NAME); + coscoAnnualreviewTemplate.setUpdateBy(currentUser.getUserId()); coscoAnnualreviewTemplateMapper.updateCoscoAnnualreviewTemplate(coscoAnnualreviewTemplate); coscoAnnualreviewTemplateIndicatorService.batchInsertCoscoAnnualreviewTemplateIndicator(coscoAnnualreviewTemplate); return 1; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java index 274d4e1..77bfadd 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java @@ -2,6 +2,8 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; +import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; 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; @@ -91,11 +93,12 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService { @Override @Transactional(rollbackFor = Exception.class) public int insertCoscoBlacklist(AddBlackListVo listVo) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); listVo.setCreateTime(new Date()); - listVo.setCreateBy(SupplierUserConstant.USER_NAME); + listVo.setCreateBy(currentUser.getUserId()); listVo.setLastUpdateTime(LocalDateTime.now()); listVo.setDelFlag(CoscoCategoryConstant.DELETE_FLAG_YES); - listVo.setDeptId(SupplierUserConstant.DEPT_ID); + listVo.setDeptId(currentUser.getDeptId()); listVo.setId(PropertyUtils.getSnowflakeId()); coscoBlacklistMapper.insertCoscoBlacklist(listVo); //添加供应商 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 6ac7704..c7365ae 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 @@ -2,7 +2,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; +import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; 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.ErrorMessageConstant; @@ -77,10 +79,11 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl implements ICoscoCategoryService { @Autowired private CoscoCategoryMapper coscoCategoryMapper; + @Autowired + private SystemClient systemClient; /** * 查询品类库_品类 @@ -73,7 +80,8 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl deptIds = new ArrayList<>(); - deptIds.add(SupplierUserConstant.DEPT_ID); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + BaseResponse orgInfo = systemClient.getOrgInfo(currentUser.getDeptId()); + if (orgInfo.isSuccess()) { + SysOrg data = orgInfo.getData(); + String orgFullId = data.getOrgFullId(); + String[] split = orgFullId.split(","); + List split1 = new ArrayList<>(); + for (String s : split) { + if(!currentUser.getDeptId().equals(s)){ + split1.add(s); + } + } + deptIds.addAll(split1); + } coscoCategory.setDeptIds(deptIds); return selectCategoryTree(coscoCategory); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java index bb4bb62..18d624c 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java @@ -47,8 +47,6 @@ public class CoscoEvaluateTaskController extends BaseController { @PostMapping("/getTaskPage") public BaseResponse> getTaskPage(@ApiParam(value = "对象数据", required = true) @RequestBody TaskPageVo taskListVo) { - BaseCacheUser currentUser = TokenUtil.getCurrentUser(); - String userId = currentUser.getUserId(); return BaseResponse.success(coscoEvaluateTaskService.getTaskPage(taskListVo)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateLevelServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateLevelServiceImpl.java index f4f6e13..0be3541 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateLevelServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateLevelServiceImpl.java @@ -3,6 +3,8 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl; import java.util.Date; import java.util.List; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; +import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; import org.springframework.beans.factory.annotation.Autowired; @@ -52,10 +54,11 @@ public class CoscoEvaluateLevelServiceImpl implements ICoscoEvaluateLevelService */ @Override public int insertCoscoEvaluateLevel(CoscoEvaluateLevel coscoEvaluateLevel) { - coscoEvaluateLevel.setCreateBy(SupplierUserConstant.USER_NAME); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + coscoEvaluateLevel.setCreateBy(currentUser.getUserId()); coscoEvaluateLevel.setCreateTime(new Date()); coscoEvaluateLevel.setId(PropertyUtils.getSnowflakeId()); - coscoEvaluateLevel.setUpdateBy(SupplierUserConstant.USER_NAME); + coscoEvaluateLevel.setUpdateBy(currentUser.getUserId()); coscoEvaluateLevel.setUpdateTime(new Date()); return coscoEvaluateLevelMapper.insertCoscoEvaluateLevel(coscoEvaluateLevel); } @@ -68,7 +71,8 @@ public class CoscoEvaluateLevelServiceImpl implements ICoscoEvaluateLevelService */ @Override public int updateCoscoEvaluateLevel(CoscoEvaluateLevel coscoEvaluateLevel) { - coscoEvaluateLevel.setUpdateBy(SupplierUserConstant.USER_NAME); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + coscoEvaluateLevel.setUpdateBy(currentUser.getUserId()); coscoEvaluateLevel.setUpdateTime(new Date()); return coscoEvaluateLevelMapper.updateCoscoEvaluateLevel(coscoEvaluateLevel); } 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 index 7017b13..9098845 100644 --- 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 @@ -1,6 +1,8 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; +import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; 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; @@ -97,7 +99,8 @@ public class CoscoEvaluateTaskAssignDeptServiceImpl implements ICoscoEvaluateTas public void insertAssignDept(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) { CoscoEvaluateTaskAssignDept dept = new CoscoEvaluateTaskAssignDept(); dept.setEvaluateTaskId(addCoscoEvaluateTaskVo.getId()); - dept.setParentDeptId(SupplierUserConstant.DEPT_ID); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + dept.setParentDeptId(currentUser.getDeptId()); //获取是否已经拥有权限，如果拥有权限不添加 List coscoEvaluateTaskAssignDepts = coscoEvaluateTaskAssignDeptMapper.selectCoscoEvaluateTaskAssignDeptList(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 951169e..330691b 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 @@ -1,15 +1,13 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl; -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.base.entity.BaseCacheUser; +import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; 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.SupplierUserConstant; -import com.chinaunicom.zyhy.ebtp.supplier.base.service.impl.UserServiceImpl; +import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService; import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo; import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo; import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType; @@ -18,14 +16,18 @@ 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.ICoscoEvaluateTaskService; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTemplateIndicatorNdService; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.*; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskService; import org.springframework.transaction.annotation.Transactional; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; + /** * 【供应商评价_评价任务主表】Service业务层处理 * @@ -37,7 +39,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { @Autowired private CoscoEvaluateTaskMapper coscoEvaluateTaskMapper; @Autowired - private UserServiceImpl userService; + private IUserService userService; @Autowired private ICoscoEvaluateTemplateIndicatorNdService coscoEvaluateTemplateIndicatorNdService; @Autowired @@ -133,12 +135,12 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { TaskUserVo vo = new TaskUserVo(); vo.setId(userId); UserVo userVo = userMap.get(userId); - if(userVo==null){ + if (userVo == null) { vo.setName(userId); vo.setUserDept(userId); vo.setUserDeptId(userId); vo.setIsSelected(true); - }else{ + } else { vo.setName(userVo.getUserName()); vo.setUserDept(userVo.getUserDept()); vo.setUserDeptId(userVo.getUserDeptId()); @@ -170,14 +172,14 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { Map userMap = new HashMap<>(); suUser.keySet().forEach(usa -> { UserVo userVo = map.get(usa); - if(userVo==null){ - userVo=new UserVo(); + if (userVo == null) { + userVo = new UserVo(); userVo.setUserId(usa); userVo.setUserName(usa); userVo.setUserDept("无"); userVo.setUserDeptId("无"); userVo.setIsSelected(true); - }else{ + } else { userVo.setIsSelected(true); } userMap.put(usa, userVo); @@ -258,7 +260,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { //根据分页数据获取是否显示分工 List taskIds = coscoEvaluateTaskListVoIPage.getRecords().stream().map(CoscoEvaluateTaskListVo::getId).collect(Collectors.toList()); //获取本部门id - taskListVo.setDeptId(SupplierUserConstant.DEPT_ID); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + taskListVo.setDeptId(currentUser.getDeptId()); taskListVo.setTaskIds(taskIds); //获取上级部门id taskListVo.setParentDeptId(SupplierUserConstant.PARENT_DEPT_ID); @@ -342,7 +345,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { @Override public int incrementalDivisionOfLaborAdditionAdd(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) { - addCoscoEvaluateTaskVo.setDeptId(SupplierUserConstant.DEPT_ID); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + addCoscoEvaluateTaskVo.setDeptId(currentUser.getDeptId()); deleteAll(addCoscoEvaluateTaskVo); addEvalTaskInfo(addCoscoEvaluateTaskVo); return 1; @@ -387,7 +391,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { * 权重信息添加 */ List taskDeptWeightList = addCoscoEvaluateTaskVo.getTaskDeptWeightList(); - Date date=new Date(); + Date date = new Date(); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); if (!taskDeptWeightList.isEmpty()) { taskDeptWeightList.forEach(taskDeptWeight -> { taskDeptWeight.setId(PropertyUtils.getSnowflakeId()); @@ -413,8 +418,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { coscoEvaluateTaskSupplier.setSupplierId(supplierId); coscoEvaluateTaskSupplier.setCreateTime(date); coscoEvaluateTaskSupplier.setUpdateTime(date); - coscoEvaluateTaskSupplier.setCreateBy(SupplierUserConstant.USER_NAME); - coscoEvaluateTaskSupplier.setUpdateBy(SupplierUserConstant.USER_NAME); + coscoEvaluateTaskSupplier.setCreateBy(currentUser.getUserId()); + coscoEvaluateTaskSupplier.setUpdateBy(currentUser.getUserId()); list.add(coscoEvaluateTaskSupplier); } Map> map = new HashMap<>(); @@ -451,8 +456,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { user.setType(invoices.get(userId).getType()); user.setCreateTime(date); user.setUpdateTime(date); - user.setCreateBy(SupplierUserConstant.USER_NAME); - user.setUpdateBy(SupplierUserConstant.USER_NAME); + user.setCreateBy(currentUser.getUserId()); + user.setUpdateBy(currentUser.getUserId()); coscoEvaluateTaskSupplierUsers.add(user); //封装人员二级项信息 添加到用户选择及打分表中 map.get(userId).forEach(indicatorId -> { @@ -467,8 +472,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { coscoEvaluateScoring.setIndicatorNdId(indicatorId); coscoEvaluateScoring.setCreateTime(date); coscoEvaluateScoring.setUpdateTime(date); - coscoEvaluateScoring.setCreateBy(SupplierUserConstant.USER_NAME); - coscoEvaluateScoring.setUpdateBy(SupplierUserConstant.USER_NAME); + coscoEvaluateScoring.setCreateBy(currentUser.getUserId()); + coscoEvaluateScoring.setUpdateBy(currentUser.getUserId()); coscoEvaluateScorings.add(coscoEvaluateScoring); }); }); @@ -485,12 +490,13 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { } private void addCoscoEvaluateTaskVo(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); addCoscoEvaluateTaskVo.setCreateTime(new Date()); addCoscoEvaluateTaskVo.setUpdateTime(new Date()); addCoscoEvaluateTaskVo.setId(PropertyUtils.getSnowflakeId()); - addCoscoEvaluateTaskVo.setCreateBy(SupplierUserConstant.USER_NAME); - addCoscoEvaluateTaskVo.setUpdateBy(SupplierUserConstant.USER_NAME); - addCoscoEvaluateTaskVo.setDeptId(SupplierUserConstant.PARENT_DEPT_ID); + addCoscoEvaluateTaskVo.setCreateBy(currentUser.getUserId()); + addCoscoEvaluateTaskVo.setUpdateBy(currentUser.getUserId()); + addCoscoEvaluateTaskVo.setDeptId(currentUser.getDeptId()); coscoEvaluateTaskMapper.insertCoscoEvaluateTask(addCoscoEvaluateTaskVo); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateIndicatorStServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateIndicatorStServiceImpl.java index fcfac78..6d5c277 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateIndicatorStServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateIndicatorStServiceImpl.java @@ -5,6 +5,8 @@ import java.util.Date; import java.util.List; import java.util.stream.Collectors; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; +import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTemplateIndicatorNd; @@ -100,14 +102,15 @@ public class CoscoEvaluateTemplateIndicatorStServiceImpl implements ICoscoEvalua @Override public void batchInsert(AddCoscoEvaluateTemplateVo templateVo) { Date date=new Date(); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); //封装批量添加信息 List indicatorStList = templateVo.getIndicatorStList(); List addAll=new ArrayList<>(); for (CoscoEvaluateTemplateIndicatorSt indicatorSt : indicatorStList) { indicatorSt.setTemplateId(templateVo.getId()); indicatorSt.setUpdateTime(date); - indicatorSt.setUpdateBy(SupplierUserConstant.USER_NAME); - indicatorSt.setCreateBy(SupplierUserConstant.USER_NAME); + indicatorSt.setUpdateBy(currentUser.getUserId()); + indicatorSt.setCreateBy(currentUser.getUserId()); indicatorSt.setId(PropertyUtils.getSnowflakeId()); indicatorSt.setCreateTime(date); //封装批量添加二级指标信息 @@ -116,8 +119,8 @@ public class CoscoEvaluateTemplateIndicatorStServiceImpl implements ICoscoEvalua indicatorNd.setTemplateId(templateVo.getId()); indicatorNd.setIndicatorStId(indicatorSt.getId()); indicatorNd.setUpdateTime(date); - indicatorNd.setUpdateBy(SupplierUserConstant.USER_NAME); - indicatorNd.setCreateBy(SupplierUserConstant.USER_NAME); + indicatorNd.setUpdateBy(currentUser.getUserId()); + indicatorNd.setCreateBy(currentUser.getUserId()); indicatorNd.setId(PropertyUtils.getSnowflakeId()); indicatorNd.setCreateTime(date); addAll.add(indicatorNd); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateServiceImpl.java index 15f5e1a..2c77144 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateServiceImpl.java @@ -7,6 +7,8 @@ import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; +import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryVO; @@ -80,11 +82,12 @@ public class CoscoEvaluateTemplateServiceImpl implements ICoscoEvaluateTemplateS @Override @Transactional(rollbackFor = Exception.class) public int insertCoscoEvaluateTemplate(AddCoscoEvaluateTemplateVo templateVo) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); templateVo.setCreateTime(new Date()); templateVo.setId(PropertyUtils.getSnowflakeId()); templateVo.setUpdateTime(new Date()); - templateVo.setCreateBy(SupplierUserConstant.USER_NAME); - templateVo.setUpdateBy(SupplierUserConstant.USER_NAME); + templateVo.setCreateBy(currentUser.getUserId()); + templateVo.setUpdateBy(currentUser.getUserId()); coscoEvaluateTemplateMapper.insertCoscoEvaluateTemplate(templateVo); // 添加一级二级评价想信息 coscoEvaluateTemplateIndicatorStService.batchInsert(templateVo); @@ -99,8 +102,9 @@ public class CoscoEvaluateTemplateServiceImpl implements ICoscoEvaluateTemplateS */ @Override public int updateCoscoEvaluateTemplate(AddCoscoEvaluateTemplateVo templateVo) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); templateVo.setUpdateTime(new Date()); - templateVo.setUpdateBy(SupplierUserConstant.USER_NAME); + templateVo.setUpdateBy(currentUser.getUserId()); coscoEvaluateTemplateMapper.updateCoscoEvaluateTemplate(templateVo); /** * 添加一级二级评价想信息 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 14a4113..564ef8c 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 @@ -2,7 +2,7 @@ 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.service.impl.UserServiceImpl; +import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService; import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo; import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo; import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType; @@ -48,7 +48,7 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService { @Autowired private CoscoMessageMapper coscoMessageMapper; @Autowired - private UserServiceImpl userService; + private IUserService userService; /** * 定时任务查看待开启的任务。如果时间小于当前时间那么开启任务 @@ -74,9 +74,9 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService { //获取当前时间指标信息 List coscoEvaluateTasks = coscoEvaluateTaskMapper.selectCloseTask(); List coscoEvaluateLevels = coscoEvaluateLevelMapper.selectCoscoEvaluateLevelList(new CoscoEvaluateLevel()); - if(!coscoEvaluateTasks.isEmpty()){ + if (!coscoEvaluateTasks.isEmpty()) { //获取任务id集合 - List taskIds= coscoEvaluateTasks.stream().map(CoscoEvaluateTask::getId).collect(Collectors.toList()); + List taskIds = coscoEvaluateTasks.stream().map(CoscoEvaluateTask::getId).collect(Collectors.toList()); //获取任务权重信息 List allCoscoEvaluateTaskDeptWeightes = coscoEvaluateTaskDeptWeightMapper.selectByTaskId(taskIds); //获取任务供应商信息 @@ -117,7 +117,7 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService { coscoEvaluateTaskMapper.updateCoscoEvaluateTask(coscoEvaluateTask); } - if(!coscoEvaluateScoringResults.isEmpty()){ + if (!coscoEvaluateScoringResults.isEmpty()) { coscoEvaluateScoringResultMapper.batchCoscoEvaluateScoringResult(coscoEvaluateScoringResults); } } diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml index 10dcc48..a040290 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml @@ -227,6 +227,7 @@ when cat.status = 2 then '已结束' end as statusName FROM cosco_annualreview_task cat + and cat.del_flag = 'normal' and cat.annualreview_theme like concat('%',#{vo.annualreviewTheme},'%') diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml index f083e55..2f487bd 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml @@ -228,6 +228,7 @@ ) as themeName FROM cosco_blacklist cb + where cb.del_falg = 'normal' order by cb.create_time desc diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml index 6ed75d0..3861b40 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml @@ -241,6 +241,7 @@ cosco_category_library_supplier_apply cclsa ON ccls.category_library_supplier_apply_id = cclsa.id AND cclsa.approve_status = 1 + and ccl.del_flag = 'normal' AND ccl.name LIKE CONCAT('%',#{vo.name},'%')