liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加项目

Browse Source
This commit is contained in:
YY
2025-07-14 13:21:40 +08:00
parent 3798126f83
commit e0f14aa4bf
21 changed files with 150 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierUserConstant.java
View File

@ -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";
/**

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IUserService.java
View File

@ -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<List<SysUser>> getUserList(SysUser vo);
List<UserVo> getUser(SelectUserVo vo);
}

1
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/AnnualScheduledTasksServiceImpl.java
View File

@ -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);
}

30
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java
View File

@ -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;
/**
* 查询供应商年审_年审任务主
@ -113,10 +114,14 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
TaskUserVo uVo = new TaskUserVo();
UserVo userVo = userMap.get(userId);
uVo.setId(userId);
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);
@ -172,15 +179,16 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
List<CoscoAnnualreviewTaskSupplier> taskSupplierList = new ArrayList<>();
List<CoscoAnnualreviewTaskSupplierUser> taskSupplierUserList = new ArrayList<>();
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<String> 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);
});

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java
View File

@ -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());

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateIndicatorServiceImpl.java
View File

@ -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<CoscoAnnualreviewTemplateIndicator> 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);
}

10
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java
View File

@ -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;

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java
View File

@ -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);
//添加供应商

9
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java
View File

@ -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<CoscoCatego
@Override
@Transactional(rollbackFor = Exception.class)
public int insertCoscoCategoryLibrary(AddCoscoCategoryLibraryVo coscoCategoryLibrary) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
coscoCategoryLibrary.setCreateTime(LocalDateTime.now());
coscoCategoryLibrary.setCreateBy(SupplierUserConstant.USER_NAME);
coscoCategoryLibrary.setCreateBy(currentUser.getUserId());
coscoCategoryLibrary.setDelFlag(CoscoCategoryConstant.DELETE_FLAG_YES);
coscoCategoryLibrary.setApplyDeptId(SupplierUserConstant.DEPT_ID);
coscoCategoryLibrary.setApplyDeptId(currentUser.getDeptId());
coscoCategoryLibrary.setId(PropertyUtils.getSnowflakeId());
if (coscoCategoryLibrary.getApproveType().equals(CoscoCategoryConstant.BUILD_TYPE_OFFLINE)) {
coscoCategoryLibrary.setApproveStatus(CoscoCategoryConstant.APPROVE_STATUS_PASS);
@ -88,7 +91,7 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
coscoCategoryLibrarAttachments.setId(PropertyUtils.getSnowflakeId());
coscoCategoryLibrarAttachments.setCategoryLibraryId(coscoCategoryLibrary.getId());
coscoCategoryLibrarAttachments.setCreateTime(LocalDateTime.now());
coscoCategoryLibrarAttachments.setCreateBy(SupplierUserConstant.USER_NAME);
coscoCategoryLibrarAttachments.setCreateBy(currentUser.getUserId());
coscoCategoryLibrarAttachments.setUpdateTime(LocalDateTime.now());
coscoCategoryLibrarAttachmentsMapper.insertCoscoCategoryLibrarAttachments(coscoCategoryLibrarAttachments);
} else {

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java
View File

@ -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.SupplierUserConstant;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarySupplierApplyMapper;
@ -83,10 +85,11 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp
@Override
@Transactional(rollbackFor = Exception.class)
public int insertCoscoCategoryLibrarySupplierApply(AddCoscoCategoryLibrarySupplierApplyVo coscoCategoryLibrarySupplierApply) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
coscoCategoryLibrarySupplierApply.setCreateTime(LocalDateTime.now());
coscoCategoryLibrarySupplierApply.setId(PropertyUtils.getSnowflakeId());
coscoCategoryLibrarySupplierApply.setCreateBy(SupplierUserConstant.USER_NAME);
coscoCategoryLibrarySupplierApply.setUpdateBy(SupplierUserConstant.USER_NAME);
coscoCategoryLibrarySupplierApply.setCreateBy(currentUser.getUserId());
coscoCategoryLibrarySupplierApply.setUpdateBy(currentUser.getUserId());
coscoCategoryLibrarySupplierApply.setUpdateDate(LocalDateTime.now());
coscoCategoryLibrarySupplierApplyMapper.insertCoscoCategoryLibrarySupplierApply(coscoCategoryLibrarySupplierApply);
coscoCategoryLibrarySupplierService.saveSupplierIds(coscoCategoryLibrarySupplierApply.getId(), coscoCategoryLibrarySupplierApply.getCategoryLibraryId(), coscoCategoryLibrarySupplierApply.getSupplierIds());

28
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java
View File

@ -4,7 +4,12 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.client.SystemClient;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.mall.ebtp.common.base.entity.SysOrg;
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;
@ -33,6 +38,8 @@ import java.util.stream.Collectors;
public class CoscoCategoryServiceImpl extends BaseServiceImpl<CoscoCategoryMapper, CoscoCategory> implements ICoscoCategoryService {
@Autowired
private CoscoCategoryMapper coscoCategoryMapper;
@Autowired
private SystemClient systemClient;
/**
* 查询品类库_品类
@ -73,7 +80,8 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl<CoscoCategoryMappe
coscoCategory.setAncestors(coscoCategory1.getAncestors() + "," + coscoCategory.getId());
}
coscoCategory.setCreateTime(new Date());
coscoCategory.setCreateBy(SupplierUserConstant.USER_NAME);
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
coscoCategory.setCreateBy(currentUser.getUserId());
coscoCategory.setDelFlag(CoscoCategoryConstant.DELETE_FLAG_YES);
return coscoCategoryMapper.insertCoscoCategory(coscoCategory);
}
@ -87,7 +95,8 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl<CoscoCategoryMappe
@Override
public int updateCoscoCategory(CoscoCategory coscoCategory) {
coscoCategory.setUpdateTime(new Date());
coscoCategory.setUpdateBy(SupplierUserConstant.USER_NAME);
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
coscoCategory.setUpdateBy(currentUser.getUserId());
return coscoCategoryMapper.updateCoscoCategory(coscoCategory);
}
@ -136,7 +145,20 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl<CoscoCategoryMappe
* 获取全部上级部门id
*/
List<String> deptIds = new ArrayList<>();
deptIds.add(SupplierUserConstant.DEPT_ID);
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
BaseResponse<SysOrg> orgInfo = systemClient.getOrgInfo(currentUser.getDeptId());
if (orgInfo.isSuccess()) {
SysOrg data = orgInfo.getData();
String orgFullId = data.getOrgFullId();
String[] split = orgFullId.split(",");
List<String> split1 = new ArrayList<>();
for (String s : split) {
if(!currentUser.getDeptId().equals(s)){
split1.add(s);
}
}
deptIds.addAll(split1);
}
coscoCategory.setDeptIds(deptIds);
return selectCategoryTree(coscoCategory);
}

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java
View File

@ -47,8 +47,6 @@ public class CoscoEvaluateTaskController extends BaseController {
@PostMapping("/getTaskPage")
public BaseResponse<IPage<TaskPageVo>> getTaskPage(@ApiParam(value = "对象数据", required = true)
@RequestBody TaskPageVo taskListVo) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
return BaseResponse.success(coscoEvaluateTaskService.getTaskPage(taskListVo));
}

10
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateLevelServiceImpl.java
View File

@ -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);
}

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskAssignDeptServiceImpl.java
View File

@ -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<CoscoEvaluateTaskAssignDept> coscoEvaluateTaskAssignDepts = coscoEvaluateTaskAssignDeptMapper.selectCoscoEvaluateTaskAssignDeptList(dept);
//如果没有权限添加

42
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java
View File

@ -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
@ -258,7 +260,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
//根据分页数据获取是否显示分工
List<String> 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;
@ -388,6 +392,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
*/
List<CoscoEvaluateTaskDeptWeight> taskDeptWeightList = addCoscoEvaluateTaskVo.getTaskDeptWeightList();
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<String, List<String>> 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);
}

11
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateIndicatorStServiceImpl.java
View File

@ -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<CoscoEvaluateTemplateIndicatorSt> indicatorStList = templateVo.getIndicatorStList();
List<CoscoEvaluateTemplateIndicatorNd> 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);

10
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateServiceImpl.java
View File

@ -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);
/**
* 添加一级二级评价想信息

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java
View File

@ -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;
/**
* 定时任务查看待开启的任务。如果时间小于当前时间那么开启任务

1
src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml
View File

@ -227,6 +227,7 @@
when cat.status = 2 then '已结束' end as statusName
FROM cosco_annualreview_task cat
<where>
and cat.del_flag = 'normal'
<if test="vo.annualreviewTheme != null and vo.annualreviewTheme != ''">
and cat.annualreview_theme like concat('%',#{vo.annualreviewTheme},'%')
</if>

1
src/main/resources/com/chinaunicom/zyhy/ebtp/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml
View File

@ -228,6 +228,7 @@
)
as themeName
FROM cosco_blacklist cb
where cb.del_falg = 'normal'
order by cb.create_time desc
</select>

1
src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml
View File

@ -241,6 +241,7 @@
cosco_category_library_supplier_apply cclsa ON ccls.category_library_supplier_apply_id = cclsa.id
AND cclsa.approve_status = 1
<where>
and ccl.del_flag = 'normal'
<if test="vo.name!=null and vo.name!=''">
AND ccl.name LIKE CONCAT('%',#{vo.name},'%')
</if>