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 16:43:29 +08:00
parent 99ac2fe3b5
commit 29e2f81390
9 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierServiceImpl.java
View File

@ -104,12 +104,12 @@ public class CoscoAnnualreviewTaskSupplierServiceImpl implements ICoscoAnnualrev
supplierListVo.getBasePageRequest().getPageSize());
IPage<AnnualreviewTaskSupplierListVo> annualreviewTaskSupplierListVoIPage =
coscoAnnualreviewTaskSupplierMapper.selectMyPage(p, supplierListVo);
//获取查询部门信息
//获取查询部门信息 TODO 待完善
List<String> deptIds=new ArrayList<>();
annualreviewTaskSupplierListVoIPage.getRecords().forEach(vo -> {
deptIds.add(vo.getDeptId());
});
//审查单位查询
//TODO 待完善 审查单位查询
return annualreviewTaskSupplierListVoIPage;
}
}

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

@ -63,7 +63,7 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua
vo.setId(id);
vo.setName(baseCategoryNameVo.getName());
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
vo.setDeptName(SupplierUserConstant.CREATE_DEPT);
vo.setDeptName(currentUser.getOrganizationId());
vo.setThemName(coscoAnnualreviewTask.getAnnualreviewTheme());
vo.setReviewerName(currentUser.getUserId());
vo.setStartTime(coscoAnnualreviewTask.getStartTime());
@ -170,20 +170,21 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua
public void addScore(AnnualAddScoreVo vo) {
//修改分数
List<AnnualTaskIndicatorVo> scoreVoList = vo.getScoreVoList();
Date date = new Date();
scoreVoList.forEach(scorevo -> {
CoscoAnnualreviewScoring scoring = new CoscoAnnualreviewScoring();
scoring.setId(scorevo.getId());
scoring.setExamineResult(scorevo.getExamineResult());
scoring.setRemark(scorevo.getRemark());
scoring.setUpdateTime(new Date());
scoring.setUpdateTime(date);
coscoAnnualreviewScoringMapper.updateCoscoAnnualreviewScoring(scoring);
});
//修改人员打分状态
CoscoAnnualreviewTaskSupplierUser coscoAnnualreviewTaskSupplierUser = new CoscoAnnualreviewTaskSupplierUser();
coscoAnnualreviewTaskSupplierUser.setId(vo.getId());
coscoAnnualreviewTaskSupplierUser.setReviewStatus(AnnualreviewTaskConstant.APPROVE_PASS);
coscoAnnualreviewTaskSupplierUser.setReviewTime(new Date());
coscoAnnualreviewTaskSupplierUser.setUpdateTime(new Date());
coscoAnnualreviewTaskSupplierUser.setReviewTime(date);
coscoAnnualreviewTaskSupplierUser.setUpdateTime(date);
coscoAnnualreviewTaskSupplierUserMapper.updateCoscoAnnualreviewTaskSupplierUser(coscoAnnualreviewTaskSupplierUser);
}

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

@ -71,8 +71,9 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT
@Override
public int insertCoscoAnnualreviewTemplate(AddCoscoAnnualreviewTemplateVo coscoAnnualreviewTemplate) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
coscoAnnualreviewTemplate.setCreateTime(new Date());
coscoAnnualreviewTemplate.setUpdateTime(new Date());
Date date = new Date();
coscoAnnualreviewTemplate.setCreateTime(date);
coscoAnnualreviewTemplate.setUpdateTime(date);
coscoAnnualreviewTemplate.setUpdateBy(currentUser.getUserId());
coscoAnnualreviewTemplate.setId(PropertyUtils.getSnowflakeId());
coscoAnnualreviewTemplate.setCreateBy(currentUser.getUserId());
@ -130,6 +131,7 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT
IPage<CoscoEvaluateTemplateVo> p = new Page<>(template.getBasePageRequest().getPageNo(),
template.getBasePageRequest().getPageSize());
IPage<CoscoAnnualreviewTemplate> coscoAnnualreviewTemplateIPage = coscoAnnualreviewTemplateMapper.selectMyPage(p, template);
//TODO 待完善
List<String> creaters = new ArrayList<>();
coscoAnnualreviewTemplateIPage.getRecords().forEach(vo -> {
creaters.add(vo.getCreateBy());

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

@ -148,15 +148,11 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
@Override
public int submit(AddBlackListVo listVo) {
//调用三方接口 获取审批流id
CoscoBlacklist coscoBlacklist = new CoscoBlacklist();
coscoBlacklist.setApproveStatus(CoscoCategoryConstant.APPROVE_STATUS_WAIT);
coscoBlacklist.setId(listVo.getId());
coscoBlacklist.setWorkFlowId(PropertyUtils.getSnowflakeId());
return coscoBlacklistMapper.updateCoscoBlacklist(coscoBlacklist);
}
@ -186,7 +182,6 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
public BlackApproveVo receiveApprove(CoscoBlacklist list) {
CoscoBlacklist coscoBlacklist = coscoBlacklistMapper.selectByWorkFlowId(list.getWorkFlowId());
List<String> supplierList = new ArrayList<>();
if (CoscoCategoryConstant.APPROVE_STATUS_WAIT.equals(coscoBlacklist.getApproveStatus())) {
coscoBlacklist.setApproveStatus(list.getApproveStatus());
coscoBlacklist.setStartTime(new Date());

12
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java
View File

@ -1,18 +1,19 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibraryContainMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibraryContain;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibraryContainService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.AddCategoryIdVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CategoryContainListVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
/**
* 品类库_品类库包含品类Service业务层处理
*
@ -101,7 +102,7 @@ public class CoscoCategoryLibraryContainServiceImpl extends BaseServiceImpl<Cosc
coscoCategoryLibraryContain.setCategoryLibraryId(id);
coscoCategoryLibraryContain.setCategoryId(categoryId.getId());
coscoCategoryLibraryContain.setLockType(categoryId.getLockType());
coscoCategoryLibraryContain.setDeptId("deptId");
coscoCategoryLibraryContain.setDeptId(TokenUtil.getCurrentUser().getOrganizationId());
list.add(coscoCategoryLibraryContain);
}
coscoCategoryLibraryContainMapper.batchCoscoCategoryLibraryContain(list);
@ -134,6 +135,7 @@ public class CoscoCategoryLibraryContainServiceImpl extends BaseServiceImpl<Cosc
*/
@Override
public List<String> selectLoctyList() {
//TODO 查询上级部门id
List<String> deptIds=new ArrayList<>();
deptIds.add("dep01");
return coscoCategoryLibraryContainMapper.selectLoctyList(deptIds);

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

@ -53,12 +53,13 @@ public class CoscoEvaluateLevelServiceImpl implements ICoscoEvaluateLevelService
*/
@Override
public int insertCoscoEvaluateLevel(CoscoEvaluateLevel coscoEvaluateLevel) {
Date date = new Date();
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
coscoEvaluateLevel.setCreateBy(currentUser.getUserId());
coscoEvaluateLevel.setCreateTime(new Date());
coscoEvaluateLevel.setCreateTime(date);
coscoEvaluateLevel.setId(PropertyUtils.getSnowflakeId());
coscoEvaluateLevel.setUpdateBy(currentUser.getUserId());
coscoEvaluateLevel.setUpdateTime(new Date());
coscoEvaluateLevel.setUpdateTime(date);
return coscoEvaluateLevelMapper.insertCoscoEvaluateLevel(coscoEvaluateLevel);
}

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

@ -293,8 +293,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
taskPageVoIPage.getRecords().forEach(taskPageVo -> {
deptIds.add(taskPageVo.getDeptId());
});
//根据部门id查询发起单位
//给与部门信息赋值
// TODO 根据部门id查询发起单位
// TODO 给与部门信息赋值
return taskPageVoIPage;
}
@ -491,8 +491,9 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
private void addCoscoEvaluateTaskVo(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
addCoscoEvaluateTaskVo.setCreateTime(new Date());
addCoscoEvaluateTaskVo.setUpdateTime(new Date());
Date date = new Date();
addCoscoEvaluateTaskVo.setCreateTime(date);
addCoscoEvaluateTaskVo.setUpdateTime(date);
addCoscoEvaluateTaskVo.setId(PropertyUtils.getSnowflakeId());
addCoscoEvaluateTaskVo.setCreateBy(currentUser.getUserId());
addCoscoEvaluateTaskVo.setUpdateBy(currentUser.getUserId());

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierUserServiceImpl.java
View File

@ -131,7 +131,7 @@ public class CoscoEvaluateTaskSupplierUserServiceImpl implements ICoscoEvaluateT
//根据人员信息进行封装
coscoEvaluateTemplateIndicatorSts.forEach(st->{
List<TaskSubIndicatorVo> collect = coscoEvaluateScorings.stream().filter(scoring -> scoring.getStId().equals(st.getId())).collect(Collectors.toList());
if(collect.size()>0){
if(!collect.isEmpty()){
TaskIndicatorVo vo=new TaskIndicatorVo();
vo.setBaseIndicator(st.getBaseIndicator());
vo.setIndicatorDesc(st.getDescIndicator());

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

@ -79,10 +79,11 @@ public class CoscoEvaluateTemplateServiceImpl implements ICoscoEvaluateTemplateS
@Override
@Transactional(rollbackFor = Exception.class)
public int insertCoscoEvaluateTemplate(AddCoscoEvaluateTemplateVo templateVo) {
Date date = new Date();
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
templateVo.setCreateTime(new Date());
templateVo.setCreateTime(date);
templateVo.setId(PropertyUtils.getSnowflakeId());
templateVo.setUpdateTime(new Date());
templateVo.setUpdateTime(date);
templateVo.setCreateBy(currentUser.getUserId());
templateVo.setUpdateBy(currentUser.getUserId());
coscoEvaluateTemplateMapper.insertCoscoEvaluateTemplate(templateVo);
@ -137,6 +138,7 @@ public class CoscoEvaluateTemplateServiceImpl implements ICoscoEvaluateTemplateS
IPage<CoscoEvaluateTemplateVo> p = new Page<>(template.getBasePageRequest().getPageNo(),
template.getBasePageRequest().getPageSize());
IPage<CoscoEvaluateTemplateVo> coscoEvaluateTemplateVoIPage = coscoEvaluateTemplateMapper.selectMyPage(p, template);
//TODO 人员添加
List<String> creaters = new ArrayList<>();
coscoEvaluateTemplateVoIPage.getRecords().forEach(vo -> {
creaters.add(vo.getCreateBy());