添加返回值
This commit is contained in:
@ -56,8 +56,9 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
|
||||
*/
|
||||
@Override
|
||||
public AddTaskVo selectCoscoAnnualreviewTaskById(String id) {
|
||||
//获取基础信息
|
||||
//根据任务id获取基础信息
|
||||
CoscoAnnualreviewTask coscoAnnualreviewTask = coscoAnnualreviewTaskMapper.selectCoscoAnnualreviewTaskById(id);
|
||||
//返回数据添加基础信息
|
||||
AddTaskVo vo = new AddTaskVo();
|
||||
vo.setId(coscoAnnualreviewTask.getId());
|
||||
vo.setAnnualreviewTheme(coscoAnnualreviewTask.getAnnualreviewTheme());
|
||||
@ -69,13 +70,13 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
|
||||
vo.setCategoryLimitation(coscoAnnualreviewTask.getCategoryLimitation());
|
||||
vo.setStatus(coscoAnnualreviewTask.getStatus());
|
||||
List<SupplierPeopleVo> list = new ArrayList<>();
|
||||
//根据任务id获取添加供应商信息
|
||||
CoscoAnnualreviewTaskSupplier coscoAnnualreviewTaskSupplier = new CoscoAnnualreviewTaskSupplier();
|
||||
coscoAnnualreviewTaskSupplier.setAnnualreviewTaskId(coscoAnnualreviewTask.getId());
|
||||
//获取添加供应商信息
|
||||
List<CoscoAnnualreviewTaskSupplier> coscoAnnualreviewTaskSuppliers = coscoAnnualreviewTaskSupplierMapper.selectCoscoAnnualreviewTaskSupplierList(coscoAnnualreviewTaskSupplier);
|
||||
//根据任务id获取供应商用户信息
|
||||
CoscoAnnualreviewTaskSupplierUser coscoAnnualreviewTaskSupplierUser = new CoscoAnnualreviewTaskSupplierUser();
|
||||
coscoAnnualreviewTaskSupplierUser.setAnnualreviewTaskId(coscoAnnualreviewTask.getId());
|
||||
//获取供应商用户信息
|
||||
List<CoscoAnnualreviewTaskSupplierUser> coscoAnnualreviewTaskSupplierUsers = coscoAnnualreviewTaskSupplierUserMapper.selectCoscoAnnualreviewTaskSupplierUserList(coscoAnnualreviewTaskSupplierUser);
|
||||
//获取用户信息
|
||||
List<UserVo> user1 = userService.getUser(new SelectUserVo());
|
||||
|
@ -50,11 +50,11 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua
|
||||
*/
|
||||
@Override
|
||||
public AnnualreviewTaskSupplierUserInfoVo selectCoscoAnnualreviewTaskSupplierUserById(String id) {
|
||||
//获取人员信息
|
||||
//使用人员id获取人员信息
|
||||
CoscoAnnualreviewTaskSupplierUser coscoAnnualreviewTaskSupplierUser = coscoAnnualreviewTaskSupplierUserMapper.selectCoscoAnnualreviewTaskSupplierUserById(id);
|
||||
//获取供应商信息
|
||||
//使用供应商id获取供应商信息
|
||||
BaseCategoryNameVo baseCategoryNameVo = coscoSupplierBaseMapper.selectNameAndCategoryName(coscoAnnualreviewTaskSupplierUser.getSupplierId());
|
||||
//获取任务信息
|
||||
//使用任务id获取任务信息
|
||||
CoscoAnnualreviewTask coscoAnnualreviewTask = coscoAnnualreviewTaskMapper.selectCoscoAnnualreviewTaskById(coscoAnnualreviewTaskSupplierUser.getAnnualreviewTaskId());
|
||||
//返回封装
|
||||
AnnualreviewTaskSupplierUserInfoVo vo = new AnnualreviewTaskSupplierUserInfoVo();
|
||||
@ -143,6 +143,7 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua
|
||||
deptIds.add(vo.getDeptId());
|
||||
});
|
||||
//发起单位查询
|
||||
//添加发起单位
|
||||
return annualreviewTaskSupplierUserVoIPage;
|
||||
}
|
||||
|
||||
|
@ -132,6 +132,7 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT
|
||||
creaters.add(vo.getCreateBy());
|
||||
});
|
||||
//根据creaters获取创建部门创建单位
|
||||
//封装创建部门
|
||||
return coscoAnnualreviewTemplateIPage;
|
||||
}
|
||||
|
||||
|
@ -247,6 +247,9 @@
|
||||
<if test="vo.approveStatus!=null">
|
||||
AND ccl.approve_status = #{vo.approveStatus}
|
||||
</if>
|
||||
<if test="vo.startTime!=null and vo.endTime!=null">
|
||||
AND ccl.create_time between #{vo.startTime} and #{vo.endTime}
|
||||
</if>
|
||||
</where>
|
||||
GROUP BY
|
||||
ccl.id
|
||||
|
@ -73,4 +73,7 @@ public class CoscoCategoryLibraryVo implements Serializable {
|
||||
* 供应商id
|
||||
*/
|
||||
private String supplierId;
|
||||
|
||||
private Date startTime;
|
||||
private Date endTime;
|
||||
}
|
||||
|
@ -303,7 +303,7 @@
|
||||
and cets.start_time between #{vo.startTime} and #{vo.endTime}
|
||||
</if>
|
||||
<if test="vo.status !=null ">
|
||||
and cets.status = #{vo.status}
|
||||
and cet.status = #{vo.status}
|
||||
</if>
|
||||
<if test="vo.userId != null and vo.userId != ''">and cetsu.user_id= #{vo.userId}</if>
|
||||
<if test="vo.taskId!=null and vo.taskId!=null">and cet.id= #{vo.taskId}</if>
|
||||
|
@ -55,7 +55,6 @@ public class CoscoEvaluateLevelServiceImpl implements ICoscoEvaluateLevelService
|
||||
coscoEvaluateLevel.setCreateBy(SupplierUserConstant.USER_NAME);
|
||||
coscoEvaluateLevel.setCreateTime(new Date());
|
||||
coscoEvaluateLevel.setId(PropertyUtils.getSnowflakeId());
|
||||
|
||||
coscoEvaluateLevel.setUpdateBy(SupplierUserConstant.USER_NAME);
|
||||
coscoEvaluateLevel.setUpdateTime(new Date());
|
||||
return coscoEvaluateLevelMapper.insertCoscoEvaluateLevel(coscoEvaluateLevel);
|
||||
|
@ -89,12 +89,18 @@ public class CoscoEvaluateTaskAssignDeptServiceImpl implements ICoscoEvaluateTas
|
||||
return coscoEvaluateTaskAssignDeptMapper.deleteCoscoEvaluateTaskAssignDeptById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加供应商评价_分派下级单位完善评价人
|
||||
* @param addCoscoEvaluateTaskVo
|
||||
*/
|
||||
@Override
|
||||
public void insertAssignDept(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) {
|
||||
CoscoEvaluateTaskAssignDept dept = new CoscoEvaluateTaskAssignDept();
|
||||
dept.setEvaluateTaskId(addCoscoEvaluateTaskVo.getId());
|
||||
dept.setParentDeptId(SupplierUserConstant.DEPT_ID);
|
||||
//获取是否已经拥有权限,如果拥有权限不添加
|
||||
List<CoscoEvaluateTaskAssignDept> coscoEvaluateTaskAssignDepts = coscoEvaluateTaskAssignDeptMapper.selectCoscoEvaluateTaskAssignDeptList(dept);
|
||||
//如果没有权限添加
|
||||
if (coscoEvaluateTaskAssignDepts.isEmpty()) {
|
||||
dept.setId(PropertyUtils.getSnowflakeId());
|
||||
dept.setStatus(addCoscoEvaluateTaskVo.getTaskStatus());
|
||||
|
@ -137,7 +137,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
|
||||
vos.add(vo);
|
||||
});
|
||||
List<String> supplierIds = list.stream().map(TaskSupplierVo::getId).collect(Collectors.toList());
|
||||
Map<String, List<String>> suppMap = list.stream().collect(Collectors.toMap(TaskSupplierVo::getId, TaskSupplierVo::getUserIds,(existing, replacement) -> existing));
|
||||
Map<String, List<String>> suppMap = list.stream().collect(Collectors.toMap(TaskSupplierVo::getId, TaskSupplierVo::getUserIds, (existing, replacement) -> existing));
|
||||
Map<String, UserVo> userMap = userService.getUser(new SelectUserVo()).stream().collect(Collectors.toMap(UserVo::getUserId, userVo -> userVo));
|
||||
List<BlackSupplierVo> blackSupplierVos = coscoSupplierBaseMapper.selectSupplierByIds(supplierIds);
|
||||
blackSupplierVos.forEach(blackSupplierVo -> {
|
||||
@ -149,7 +149,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
|
||||
vo.setName(userMap.get(userId).getUserName());
|
||||
vo.setUserDept(userMap.get(userId).getUserDept());
|
||||
vo.setUserDeptId(userMap.get(userId).getUserDeptId());
|
||||
vo.setIsSelected( true);
|
||||
vo.setIsSelected(true);
|
||||
taskUserVos.add(vo);
|
||||
});
|
||||
blackSupplierVo.setUserList(taskUserVos);
|
||||
@ -253,12 +253,16 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
|
||||
IPage<CoscoEvaluateTaskListVo> coscoEvaluateTaskListVoIPage = coscoEvaluateTaskMapper.selectMyPage(p, taskListVo);
|
||||
//根据分页数据获取是否显示分工
|
||||
List<String> taskIds = coscoEvaluateTaskListVoIPage.getRecords().stream().map(CoscoEvaluateTaskListVo::getId).collect(Collectors.toList());
|
||||
//获取本部门id
|
||||
taskListVo.setDeptId(SupplierUserConstant.DEPT_ID);
|
||||
taskListVo.setTaskIds(taskIds);
|
||||
//获取上级部门id
|
||||
taskListVo.setParentDeptId(SupplierUserConstant.PARENT_DEPT_ID);
|
||||
//获取上级部门开放分工参数
|
||||
List<DivisionVo> vos = coscoEvaluateTaskMapper.selectDivisionVo(taskListVo);
|
||||
//根据分工参数获取内容
|
||||
Map<String, String> 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()));
|
||||
@ -276,12 +280,14 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
|
||||
public IPage<TaskPageVo> getTaskPage(TaskPageVo taskListVo) {
|
||||
IPage<CoscoEvaluateTaskListVo> p = new Page<>(taskListVo.getBasePageRequest().getPageNo(),
|
||||
taskListVo.getBasePageRequest().getPageSize());
|
||||
//获取分页数据
|
||||
IPage<TaskPageVo> taskPageVoIPage = coscoEvaluateTaskMapper.selectTaskPage(p, taskListVo);
|
||||
List<String> deptIds = new ArrayList<>();
|
||||
taskPageVoIPage.getRecords().forEach(taskPageVo -> {
|
||||
deptIds.add(taskPageVo.getDeptId());
|
||||
});
|
||||
//根据部门id查询发起单位
|
||||
//给与部门信息赋值
|
||||
return taskPageVoIPage;
|
||||
}
|
||||
|
||||
@ -310,9 +316,12 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
|
||||
@Override
|
||||
@MessageLog(messageType = MessageType.MESSAGETYPE_GYSJYSH)
|
||||
public ApproveVo evaluateApprove(AddCoscoEvaluateTaskVo vo) {
|
||||
//根据工作流id查询任务信息
|
||||
CoscoEvaluateTask coscoEvaluateTask = coscoEvaluateTaskMapper.selectByWorkFlowId(vo.getWorkFlowId());
|
||||
coscoEvaluateTask.setApproveStatus(vo.getApproveStatus());
|
||||
//修改任务信息
|
||||
coscoEvaluateTaskMapper.updateCoscoEvaluateTask(coscoEvaluateTask);
|
||||
//消息信息赋值
|
||||
ApproveVo aVo = new ApproveVo();
|
||||
aVo.setResult(vo.getApproveStatus());
|
||||
aVo.setCreateBy(coscoEvaluateTask.getCreateBy());
|
||||
@ -320,6 +329,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
|
||||
aVo.setTaskName(coscoEvaluateTask.getEvaluateTheme());
|
||||
CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier = new CoscoEvaluateTaskSupplier();
|
||||
coscoEvaluateTaskSupplier.setEvaluateTaskId(coscoEvaluateTask.getId());
|
||||
//获取当前任务功行赏id信息
|
||||
List<CoscoEvaluateTaskSupplier> coscoEvaluateTaskSuppliers = coscoEvaluateTaskSupplierMapper.selectCoscoEvaluateTaskSupplierList(coscoEvaluateTaskSupplier);
|
||||
List<String> supplierIds = coscoEvaluateTaskSuppliers.stream().map(CoscoEvaluateTaskSupplier::getSupplierId).collect(Collectors.toList());
|
||||
aVo.setSupplierIds(supplierIds);
|
||||
@ -344,14 +354,15 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public int addTask(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) {
|
||||
try {
|
||||
//添加主表信息
|
||||
//添加主表信息 根据id判断是添加还是修改
|
||||
if (addCoscoEvaluateTaskVo.getId() == null) {
|
||||
addCoscoEvaluateTaskVo(addCoscoEvaluateTaskVo);
|
||||
} else {
|
||||
updateCoscoEvaluateTask(addCoscoEvaluateTaskVo);
|
||||
}
|
||||
//删除任务信息
|
||||
deleteAll(addCoscoEvaluateTaskVo);
|
||||
|
||||
//添加任务信息详情
|
||||
addEvalTaskInfo(addCoscoEvaluateTaskVo);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
@ -388,6 +399,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
|
||||
supplierIds.add(supplierId.getId());
|
||||
supplierUserIds.put(supplierId.getId(), supplierId.getUserIds());
|
||||
}
|
||||
//添加供应商列表信息
|
||||
List<CoscoEvaluateTaskSupplier> list = new ArrayList<>();
|
||||
for (String supplierId : supplierIds) {
|
||||
CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier = new CoscoEvaluateTaskSupplier();
|
||||
@ -460,9 +472,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
|
||||
coscoEvaluateScoringMapper.batchCoscoEvaluateScoring(coscoEvaluateScorings);
|
||||
coscoEvaluateTaskSupplierUserMapper.batchCoscoEvaluateTaskSupplierUser(coscoEvaluateTaskSupplierUsers);
|
||||
coscoEvaluateTaskUserIndicatorMapper.batchCoscoEvaluateTaskUserIndicator(coscoEvaluateTaskSupplierUserIndicators);
|
||||
/**
|
||||
* 添加评价是否可以下级提交
|
||||
*/
|
||||
//添加评价是否可以下级提交人员信息 修改不可添加
|
||||
if (addCoscoEvaluateTaskVo.getTaskStatus() != null) {
|
||||
coscoEvaluateTaskAssignDeptService.insertAssignDept(addCoscoEvaluateTaskVo);
|
||||
}
|
||||
@ -480,6 +490,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
|
||||
|
||||
/**
|
||||
* 人员信息封装
|
||||
*
|
||||
* @param userMap
|
||||
* @param vo
|
||||
* @param coscoEvaluateTemplateIndicatorNds
|
||||
@ -487,22 +498,21 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
|
||||
public void adduserMap(Map<String, List<String>> userMap, AdduserIndicatorVo vo,
|
||||
List<CoscoEvaluateTemplateIndicatorNd> coscoEvaluateTemplateIndicatorNds) {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
//获取二级信息项数据
|
||||
coscoEvaluateTemplateIndicatorNds.forEach(coscoEvaluateTemplateIndicatorNd -> {
|
||||
map.put(coscoEvaluateTemplateIndicatorNd.getId(), coscoEvaluateTemplateIndicatorNd.getIndicatorStId());
|
||||
});
|
||||
//一级项信息
|
||||
//Map<String, String> stIdMap = new HashMap<>();
|
||||
//二级项信息
|
||||
//二级项信息判断是否是全量添加还是选择添加
|
||||
Map<String, String> ndIdMap = new HashMap<>();
|
||||
//选择添加逻辑
|
||||
if (CoscoCategoryConstant.CATEGORY_LEVEL_TOP.equals(vo.getType())) {
|
||||
coscoEvaluateTemplateIndicatorNds.forEach(coscoEvaluateTemplateIndicatorNd -> {
|
||||
//stIdMap.put(coscoEvaluateTemplateIndicatorNd.getIndicatorStId(), coscoEvaluateTemplateIndicatorNd.getIndicatorStId());
|
||||
ndIdMap.put(coscoEvaluateTemplateIndicatorNd.getId(), coscoEvaluateTemplateIndicatorNd.getId());
|
||||
});
|
||||
//全部添加逻辑
|
||||
} else {
|
||||
List<String> indicatorIds = vo.getIndicatorIds();
|
||||
indicatorIds.forEach(indicatorId -> {
|
||||
//stIdMap.put(map.get(indicatorId), map.get(indicatorId));
|
||||
ndIdMap.put(indicatorId, indicatorId);
|
||||
});
|
||||
}
|
||||
|
@ -157,21 +157,22 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS
|
||||
CoscoEvaluateTask coscoEvaluateTask = coscoEvaluateTaskMapper.selectCoscoEvaluateTaskById(coscoEvaluateTaskSupplier.getEvaluateTaskId());
|
||||
//获取供应商名称和品类名称
|
||||
BaseCategoryNameVo baseCategoryNameVo = coscoSupplierBaseMapper.selectNameAndCategoryName(coscoEvaluateTaskSupplier.getSupplierId());
|
||||
//封装返回值信息
|
||||
TaskIndicatorBaseVo taskIndicatorBaseVo = new TaskIndicatorBaseVo();
|
||||
taskIndicatorBaseVo.setName(baseCategoryNameVo.getName());
|
||||
taskIndicatorBaseVo.setCategory(baseCategoryNameVo.getCategoryName());
|
||||
List<TaskIndicatorVo> taskIndicatorVo = new ArrayList<>();
|
||||
//根据供应商任务id获取评分数据
|
||||
CoscoEvaluateScoringResult result = new CoscoEvaluateScoringResult();
|
||||
result.setEvaluateTaskSupplierId(id);
|
||||
//获取评分数据
|
||||
List<CoscoEvaluateScoringResult> coscoEvaluateScoringResults = coscoEvaluateScoringResultMapper.selectCoscoEvaluateScoringResultList(result);
|
||||
//根据模板id获取评分二级节点数据
|
||||
CoscoEvaluateTemplateIndicatorNd coscoEvaluateTemplateIndicatorNd = new CoscoEvaluateTemplateIndicatorNd();
|
||||
coscoEvaluateTemplateIndicatorNd.setTemplateId(coscoEvaluateTask.getTemplateId());
|
||||
//获取评分二级节点数据
|
||||
List<CoscoEvaluateTemplateIndicatorNd> coscoEvaluateTemplateIndicatorNds = coscoEvaluateTemplateIndicatorNdMapper.selectCoscoEvaluateTemplateIndicatorNdList(coscoEvaluateTemplateIndicatorNd);
|
||||
//根据模板id获取评分一级节点数据
|
||||
CoscoEvaluateTemplateIndicatorSt coscoEvaluateTemplateIndicatorSt = new CoscoEvaluateTemplateIndicatorSt();
|
||||
coscoEvaluateTemplateIndicatorSt.setTemplateId(coscoEvaluateTask.getTemplateId());
|
||||
//获取评分一级节点数据
|
||||
List<CoscoEvaluateTemplateIndicatorSt> coscoEvaluateTemplateIndicatorSts =
|
||||
coscoEvaluateTemplateIndicatorStMapper.selectCoscoEvaluateTemplateIndicatorStList(coscoEvaluateTemplateIndicatorSt);
|
||||
//根据一级节点封装数据
|
||||
@ -191,7 +192,7 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS
|
||||
}
|
||||
subIndicator.add(vo);
|
||||
}
|
||||
//一级节点封装
|
||||
//一级节点封装返回值
|
||||
TaskIndicatorVo vo = new TaskIndicatorVo();
|
||||
vo.setBaseIndicator(st.getBaseIndicator());
|
||||
vo.setIndicatorDesc(st.getDescIndicator());
|
||||
|
@ -111,21 +111,21 @@ public class CoscoEvaluateTaskSupplierUserServiceImpl implements ICoscoEvaluateT
|
||||
|
||||
@Override
|
||||
public TaskIndicatorBaseVo getIndicator(String id) {
|
||||
//获取人员信息
|
||||
//根据用户打分id获取打分人信息
|
||||
CoscoEvaluateTaskSupplierUser coscoEvaluateTaskSupplierUser = coscoEvaluateTaskSupplierUserMapper.selectCoscoEvaluateTaskSupplierUserById(id);
|
||||
//获取项目信息
|
||||
//根据项目id获取项目信息
|
||||
CoscoEvaluateTask coscoEvaluateTask = coscoEvaluateTaskMapper.selectCoscoEvaluateTaskById(coscoEvaluateTaskSupplierUser.getEvaluateTaskId());
|
||||
//项目信息
|
||||
//根据项目id获取供应商信息和分类信息
|
||||
BaseCategoryNameVo baseCategoryNameVo = coscoSupplierBaseMapper.selectNameAndCategoryName(coscoEvaluateTaskSupplierUser.getSupplierId());
|
||||
TaskIndicatorBaseVo taskIndicatorBaseVo = new TaskIndicatorBaseVo();
|
||||
taskIndicatorBaseVo.setName(baseCategoryNameVo.getName());
|
||||
taskIndicatorBaseVo.setCategory(baseCategoryNameVo.getCategoryName());
|
||||
List<TaskIndicatorVo> taskIndicatorVo=new ArrayList<>();
|
||||
//查询添加的项目评价指标
|
||||
//根据用户id查询添加的项目评价指标
|
||||
List<TaskSubIndicatorVo> coscoEvaluateScorings = coscoEvaluateScoringMapper.selectTaskSubIndicatorVo(id);
|
||||
//根据评价模板id获取二级项目信息
|
||||
CoscoEvaluateTemplateIndicatorSt coscoEvaluateTemplateIndicatorSt=new CoscoEvaluateTemplateIndicatorSt();
|
||||
coscoEvaluateTemplateIndicatorSt.setTemplateId(coscoEvaluateTask.getTemplateId());
|
||||
//获取二级项目信息
|
||||
List<CoscoEvaluateTemplateIndicatorSt> coscoEvaluateTemplateIndicatorSts =
|
||||
coscoEvaluateTemplateIndicatorStMapper.selectCoscoEvaluateTemplateIndicatorStList(coscoEvaluateTemplateIndicatorSt);
|
||||
//根据人员信息进行封装
|
||||
@ -152,7 +152,7 @@ public class CoscoEvaluateTaskSupplierUserServiceImpl implements ICoscoEvaluateT
|
||||
public void getScore(AddScoreVo vo) {
|
||||
//打分结果添加
|
||||
int i =0;
|
||||
//修改列表
|
||||
//修改打分表信息
|
||||
List<ScoreVo> scoreVoList = vo.getScoreVoList();
|
||||
for (ScoreVo voVo : scoreVoList){
|
||||
if(voVo.getScore()!=null && !voVo.getScore().equals("")){
|
||||
@ -164,7 +164,7 @@ public class CoscoEvaluateTaskSupplierUserServiceImpl implements ICoscoEvaluateT
|
||||
i++;
|
||||
}
|
||||
}
|
||||
//批量修改数据
|
||||
//修改人员打分状态
|
||||
if(i>0){
|
||||
CoscoEvaluateTaskSupplierUser user=new CoscoEvaluateTaskSupplierUser();
|
||||
user.setId(vo.getId());
|
||||
|
@ -86,9 +86,7 @@ public class CoscoEvaluateTemplateServiceImpl implements ICoscoEvaluateTemplateS
|
||||
templateVo.setCreateBy(SupplierUserConstant.USER_NAME);
|
||||
templateVo.setUpdateBy(SupplierUserConstant.USER_NAME);
|
||||
coscoEvaluateTemplateMapper.insertCoscoEvaluateTemplate(templateVo);
|
||||
/**
|
||||
* 添加一级二级评价想信息
|
||||
*/
|
||||
// 添加一级二级评价想信息
|
||||
coscoEvaluateTemplateIndicatorStService.batchInsert(templateVo);
|
||||
return 1;
|
||||
}
|
||||
|
@ -256,7 +256,7 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
|
||||
CoscoMessage coscoMessage = new CoscoMessage();
|
||||
coscoMessage.setId(PropertyUtils.getSnowflakeId());
|
||||
coscoMessage.setReceiverId(becomeDueVo.getCreater());
|
||||
coscoMessage.setContent("您准入的" + becomeDueVo.getName() + "供应商黑名单时效到期,请及时提交解除申请:");
|
||||
coscoMessage.setContent("您准入的" + becomeDueVo.getName() + "供应商黑名单时效到期,请及时提交解除申请。");
|
||||
coscoMessage.setType(MessageType.BLACKLIST_EXPIRE);
|
||||
coscoMessage.setCreateTime(new Date());
|
||||
coscoMessage.setUpdateTime(new Date());
|
||||
|
Reference in New Issue
Block a user