Compare commits
2 Commits
2a5bab6a89
...
29e2f81390
Author | SHA1 | Date | |
---|---|---|---|
29e2f81390 | |||
99ac2fe3b5 |
@ -1,7 +1,6 @@
|
|||||||
package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.impl;
|
package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.impl;
|
||||||
|
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.AnnualreviewTaskConstant;
|
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.AnnualreviewTaskConstant;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
|
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
|
import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
|
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewScoringMapper;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewScoringMapper;
|
||||||
|
@ -104,12 +104,12 @@ public class CoscoAnnualreviewTaskSupplierServiceImpl implements ICoscoAnnualrev
|
|||||||
supplierListVo.getBasePageRequest().getPageSize());
|
supplierListVo.getBasePageRequest().getPageSize());
|
||||||
IPage<AnnualreviewTaskSupplierListVo> annualreviewTaskSupplierListVoIPage =
|
IPage<AnnualreviewTaskSupplierListVo> annualreviewTaskSupplierListVoIPage =
|
||||||
coscoAnnualreviewTaskSupplierMapper.selectMyPage(p, supplierListVo);
|
coscoAnnualreviewTaskSupplierMapper.selectMyPage(p, supplierListVo);
|
||||||
//获取查询部门信息
|
//获取查询部门信息 TODO 待完善
|
||||||
List<String> deptIds=new ArrayList<>();
|
List<String> deptIds=new ArrayList<>();
|
||||||
annualreviewTaskSupplierListVoIPage.getRecords().forEach(vo -> {
|
annualreviewTaskSupplierListVoIPage.getRecords().forEach(vo -> {
|
||||||
deptIds.add(vo.getDeptId());
|
deptIds.add(vo.getDeptId());
|
||||||
});
|
});
|
||||||
//审查单位查询
|
//TODO 待完善 审查单位查询
|
||||||
return annualreviewTaskSupplierListVoIPage;
|
return annualreviewTaskSupplierListVoIPage;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua
|
|||||||
vo.setId(id);
|
vo.setId(id);
|
||||||
vo.setName(baseCategoryNameVo.getName());
|
vo.setName(baseCategoryNameVo.getName());
|
||||||
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
|
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
|
||||||
vo.setDeptName(SupplierUserConstant.CREATE_DEPT);
|
vo.setDeptName(currentUser.getOrganizationId());
|
||||||
vo.setThemName(coscoAnnualreviewTask.getAnnualreviewTheme());
|
vo.setThemName(coscoAnnualreviewTask.getAnnualreviewTheme());
|
||||||
vo.setReviewerName(currentUser.getUserId());
|
vo.setReviewerName(currentUser.getUserId());
|
||||||
vo.setStartTime(coscoAnnualreviewTask.getStartTime());
|
vo.setStartTime(coscoAnnualreviewTask.getStartTime());
|
||||||
@ -170,20 +170,21 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua
|
|||||||
public void addScore(AnnualAddScoreVo vo) {
|
public void addScore(AnnualAddScoreVo vo) {
|
||||||
//修改分数
|
//修改分数
|
||||||
List<AnnualTaskIndicatorVo> scoreVoList = vo.getScoreVoList();
|
List<AnnualTaskIndicatorVo> scoreVoList = vo.getScoreVoList();
|
||||||
|
Date date = new Date();
|
||||||
scoreVoList.forEach(scorevo -> {
|
scoreVoList.forEach(scorevo -> {
|
||||||
CoscoAnnualreviewScoring scoring = new CoscoAnnualreviewScoring();
|
CoscoAnnualreviewScoring scoring = new CoscoAnnualreviewScoring();
|
||||||
scoring.setId(scorevo.getId());
|
scoring.setId(scorevo.getId());
|
||||||
scoring.setExamineResult(scorevo.getExamineResult());
|
scoring.setExamineResult(scorevo.getExamineResult());
|
||||||
scoring.setRemark(scorevo.getRemark());
|
scoring.setRemark(scorevo.getRemark());
|
||||||
scoring.setUpdateTime(new Date());
|
scoring.setUpdateTime(date);
|
||||||
coscoAnnualreviewScoringMapper.updateCoscoAnnualreviewScoring(scoring);
|
coscoAnnualreviewScoringMapper.updateCoscoAnnualreviewScoring(scoring);
|
||||||
});
|
});
|
||||||
//修改人员打分状态
|
//修改人员打分状态
|
||||||
CoscoAnnualreviewTaskSupplierUser coscoAnnualreviewTaskSupplierUser = new CoscoAnnualreviewTaskSupplierUser();
|
CoscoAnnualreviewTaskSupplierUser coscoAnnualreviewTaskSupplierUser = new CoscoAnnualreviewTaskSupplierUser();
|
||||||
coscoAnnualreviewTaskSupplierUser.setId(vo.getId());
|
coscoAnnualreviewTaskSupplierUser.setId(vo.getId());
|
||||||
coscoAnnualreviewTaskSupplierUser.setReviewStatus(AnnualreviewTaskConstant.APPROVE_PASS);
|
coscoAnnualreviewTaskSupplierUser.setReviewStatus(AnnualreviewTaskConstant.APPROVE_PASS);
|
||||||
coscoAnnualreviewTaskSupplierUser.setReviewTime(new Date());
|
coscoAnnualreviewTaskSupplierUser.setReviewTime(date);
|
||||||
coscoAnnualreviewTaskSupplierUser.setUpdateTime(new Date());
|
coscoAnnualreviewTaskSupplierUser.setUpdateTime(date);
|
||||||
coscoAnnualreviewTaskSupplierUserMapper.updateCoscoAnnualreviewTaskSupplierUser(coscoAnnualreviewTaskSupplierUser);
|
coscoAnnualreviewTaskSupplierUserMapper.updateCoscoAnnualreviewTaskSupplierUser(coscoAnnualreviewTaskSupplierUser);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,18 +1,17 @@
|
|||||||
package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.impl;
|
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.entity.BaseCacheUser;
|
||||||
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
|
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
|
||||||
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
|
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;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewTemplateIndicatorMapper;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewTemplateIndicatorMapper;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTemplateIndicator;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTemplateIndicator;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.ICoscoAnnualreviewTemplateIndicatorService;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.ICoscoAnnualreviewTemplateIndicatorService;
|
||||||
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AddCoscoAnnualreviewTemplateVo;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 供应商年审_年审模板指标项Service业务层处理
|
* 供应商年审_年审模板指标项Service业务层处理
|
||||||
|
@ -6,7 +6,6 @@ import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
|
|||||||
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
|
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
|
||||||
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
|
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.ReviewTemplateConstant;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
|
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewTemplateMapper;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewTemplateMapper;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTemplate;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTemplate;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTemplateIndicator;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTemplateIndicator;
|
||||||
@ -72,8 +71,9 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT
|
|||||||
@Override
|
@Override
|
||||||
public int insertCoscoAnnualreviewTemplate(AddCoscoAnnualreviewTemplateVo coscoAnnualreviewTemplate) {
|
public int insertCoscoAnnualreviewTemplate(AddCoscoAnnualreviewTemplateVo coscoAnnualreviewTemplate) {
|
||||||
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
|
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
|
||||||
coscoAnnualreviewTemplate.setCreateTime(new Date());
|
Date date = new Date();
|
||||||
coscoAnnualreviewTemplate.setUpdateTime(new Date());
|
coscoAnnualreviewTemplate.setCreateTime(date);
|
||||||
|
coscoAnnualreviewTemplate.setUpdateTime(date);
|
||||||
coscoAnnualreviewTemplate.setUpdateBy(currentUser.getUserId());
|
coscoAnnualreviewTemplate.setUpdateBy(currentUser.getUserId());
|
||||||
coscoAnnualreviewTemplate.setId(PropertyUtils.getSnowflakeId());
|
coscoAnnualreviewTemplate.setId(PropertyUtils.getSnowflakeId());
|
||||||
coscoAnnualreviewTemplate.setCreateBy(currentUser.getUserId());
|
coscoAnnualreviewTemplate.setCreateBy(currentUser.getUserId());
|
||||||
@ -131,6 +131,7 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT
|
|||||||
IPage<CoscoEvaluateTemplateVo> p = new Page<>(template.getBasePageRequest().getPageNo(),
|
IPage<CoscoEvaluateTemplateVo> p = new Page<>(template.getBasePageRequest().getPageNo(),
|
||||||
template.getBasePageRequest().getPageSize());
|
template.getBasePageRequest().getPageSize());
|
||||||
IPage<CoscoAnnualreviewTemplate> coscoAnnualreviewTemplateIPage = coscoAnnualreviewTemplateMapper.selectMyPage(p, template);
|
IPage<CoscoAnnualreviewTemplate> coscoAnnualreviewTemplateIPage = coscoAnnualreviewTemplateMapper.selectMyPage(p, template);
|
||||||
|
//TODO 待完善
|
||||||
List<String> creaters = new ArrayList<>();
|
List<String> creaters = new ArrayList<>();
|
||||||
coscoAnnualreviewTemplateIPage.getRecords().forEach(vo -> {
|
coscoAnnualreviewTemplateIPage.getRecords().forEach(vo -> {
|
||||||
creaters.add(vo.getCreateBy());
|
creaters.add(vo.getCreateBy());
|
||||||
|
@ -7,7 +7,6 @@ import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
|
|||||||
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
|
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.CoscoCategoryConstant;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.EvaluateTaskConstant;
|
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.EvaluateTaskConstant;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
|
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
|
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
|
import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
|
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
|
||||||
@ -149,15 +148,11 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int submit(AddBlackListVo listVo) {
|
public int submit(AddBlackListVo listVo) {
|
||||||
|
|
||||||
//调用三方接口 获取审批流id
|
//调用三方接口 获取审批流id
|
||||||
CoscoBlacklist coscoBlacklist = new CoscoBlacklist();
|
CoscoBlacklist coscoBlacklist = new CoscoBlacklist();
|
||||||
coscoBlacklist.setApproveStatus(CoscoCategoryConstant.APPROVE_STATUS_WAIT);
|
coscoBlacklist.setApproveStatus(CoscoCategoryConstant.APPROVE_STATUS_WAIT);
|
||||||
coscoBlacklist.setId(listVo.getId());
|
coscoBlacklist.setId(listVo.getId());
|
||||||
|
|
||||||
|
|
||||||
coscoBlacklist.setWorkFlowId(PropertyUtils.getSnowflakeId());
|
coscoBlacklist.setWorkFlowId(PropertyUtils.getSnowflakeId());
|
||||||
|
|
||||||
return coscoBlacklistMapper.updateCoscoBlacklist(coscoBlacklist);
|
return coscoBlacklistMapper.updateCoscoBlacklist(coscoBlacklist);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -187,7 +182,6 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
|
|||||||
public BlackApproveVo receiveApprove(CoscoBlacklist list) {
|
public BlackApproveVo receiveApprove(CoscoBlacklist list) {
|
||||||
CoscoBlacklist coscoBlacklist = coscoBlacklistMapper.selectByWorkFlowId(list.getWorkFlowId());
|
CoscoBlacklist coscoBlacklist = coscoBlacklistMapper.selectByWorkFlowId(list.getWorkFlowId());
|
||||||
List<String> supplierList = new ArrayList<>();
|
List<String> supplierList = new ArrayList<>();
|
||||||
|
|
||||||
if (CoscoCategoryConstant.APPROVE_STATUS_WAIT.equals(coscoBlacklist.getApproveStatus())) {
|
if (CoscoCategoryConstant.APPROVE_STATUS_WAIT.equals(coscoBlacklist.getApproveStatus())) {
|
||||||
coscoBlacklist.setApproveStatus(list.getApproveStatus());
|
coscoBlacklist.setApproveStatus(list.getApproveStatus());
|
||||||
coscoBlacklist.setStartTime(new Date());
|
coscoBlacklist.setStartTime(new Date());
|
||||||
|
@ -1,18 +1,19 @@
|
|||||||
package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.impl;
|
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.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.dao.CoscoCategoryLibraryContainMapper;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibraryContain;
|
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.AddCategoryIdVo;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CategoryContainListVo;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CategoryContainListVo;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 品类库_品类库包含品类Service业务层处理
|
* 品类库_品类库包含品类Service业务层处理
|
||||||
*
|
*
|
||||||
@ -101,7 +102,7 @@ public class CoscoCategoryLibraryContainServiceImpl extends BaseServiceImpl<Cosc
|
|||||||
coscoCategoryLibraryContain.setCategoryLibraryId(id);
|
coscoCategoryLibraryContain.setCategoryLibraryId(id);
|
||||||
coscoCategoryLibraryContain.setCategoryId(categoryId.getId());
|
coscoCategoryLibraryContain.setCategoryId(categoryId.getId());
|
||||||
coscoCategoryLibraryContain.setLockType(categoryId.getLockType());
|
coscoCategoryLibraryContain.setLockType(categoryId.getLockType());
|
||||||
coscoCategoryLibraryContain.setDeptId("deptId");
|
coscoCategoryLibraryContain.setDeptId(TokenUtil.getCurrentUser().getOrganizationId());
|
||||||
list.add(coscoCategoryLibraryContain);
|
list.add(coscoCategoryLibraryContain);
|
||||||
}
|
}
|
||||||
coscoCategoryLibraryContainMapper.batchCoscoCategoryLibraryContain(list);
|
coscoCategoryLibraryContainMapper.batchCoscoCategoryLibraryContain(list);
|
||||||
@ -134,6 +135,7 @@ public class CoscoCategoryLibraryContainServiceImpl extends BaseServiceImpl<Cosc
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<String> selectLoctyList() {
|
public List<String> selectLoctyList() {
|
||||||
|
//TODO 查询上级部门id
|
||||||
List<String> deptIds=new ArrayList<>();
|
List<String> deptIds=new ArrayList<>();
|
||||||
deptIds.add("dep01");
|
deptIds.add("dep01");
|
||||||
return coscoCategoryLibraryContainMapper.selectLoctyList(deptIds);
|
return coscoCategoryLibraryContainMapper.selectLoctyList(deptIds);
|
||||||
|
@ -7,8 +7,6 @@ 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.base.util.TokenUtil;
|
||||||
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
|
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.CoscoCategoryConstant;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ErrorMessageConstant;
|
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
|
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarAttachmentsMapper;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarAttachmentsMapper;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibraryMapper;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibraryMapper;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryMapper;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryMapper;
|
||||||
|
@ -6,10 +6,8 @@ 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.service.impl.BaseServiceImpl;
|
||||||
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
|
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
|
||||||
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
|
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;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarySupplierApplyMapper;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryMapper;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryMapper;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategory;
|
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibraryContainService;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibraryContainService;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarySupplierApplyService;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarySupplierApplyService;
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.impl;
|
package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.impl;
|
||||||
|
|
||||||
import cn.hutool.core.bean.BeanUtil;
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
import cn.hutool.core.util.IdUtil;
|
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.chinaunicom.mall.ebtp.common.base.client.SystemClient;
|
import com.chinaunicom.mall.ebtp.common.base.client.SystemClient;
|
||||||
@ -12,15 +11,12 @@ 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.base.util.TokenUtil;
|
||||||
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
|
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.CoscoCategoryConstant;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ErrorMessageConstant;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryMapper;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
|
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.*;
|
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategory;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategory;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryVO;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryVO;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.cloud.commons.util.IdUtils;
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
@ -1,17 +1,16 @@
|
|||||||
package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl;
|
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.entity.BaseCacheUser;
|
||||||
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
|
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
|
||||||
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
|
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateLevelMapper;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateLevelMapper;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateLevel;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateLevel;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateLevelService;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateLevelService;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 【请填写功能名称】Service业务层处理
|
* 【请填写功能名称】Service业务层处理
|
||||||
@ -54,12 +53,13 @@ public class CoscoEvaluateLevelServiceImpl implements ICoscoEvaluateLevelService
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public int insertCoscoEvaluateLevel(CoscoEvaluateLevel coscoEvaluateLevel) {
|
public int insertCoscoEvaluateLevel(CoscoEvaluateLevel coscoEvaluateLevel) {
|
||||||
|
Date date = new Date();
|
||||||
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
|
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
|
||||||
coscoEvaluateLevel.setCreateBy(currentUser.getUserId());
|
coscoEvaluateLevel.setCreateBy(currentUser.getUserId());
|
||||||
coscoEvaluateLevel.setCreateTime(new Date());
|
coscoEvaluateLevel.setCreateTime(date);
|
||||||
coscoEvaluateLevel.setId(PropertyUtils.getSnowflakeId());
|
coscoEvaluateLevel.setId(PropertyUtils.getSnowflakeId());
|
||||||
coscoEvaluateLevel.setUpdateBy(currentUser.getUserId());
|
coscoEvaluateLevel.setUpdateBy(currentUser.getUserId());
|
||||||
coscoEvaluateLevel.setUpdateTime(new Date());
|
coscoEvaluateLevel.setUpdateTime(date);
|
||||||
return coscoEvaluateLevelMapper.insertCoscoEvaluateLevel(coscoEvaluateLevel);
|
return coscoEvaluateLevelMapper.insertCoscoEvaluateLevel(coscoEvaluateLevel);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -293,8 +293,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
|
|||||||
taskPageVoIPage.getRecords().forEach(taskPageVo -> {
|
taskPageVoIPage.getRecords().forEach(taskPageVo -> {
|
||||||
deptIds.add(taskPageVo.getDeptId());
|
deptIds.add(taskPageVo.getDeptId());
|
||||||
});
|
});
|
||||||
//根据部门id查询发起单位
|
// TODO 根据部门id查询发起单位
|
||||||
//给与部门信息赋值
|
// TODO 给与部门信息赋值
|
||||||
return taskPageVoIPage;
|
return taskPageVoIPage;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -491,8 +491,9 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
|
|||||||
|
|
||||||
private void addCoscoEvaluateTaskVo(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) {
|
private void addCoscoEvaluateTaskVo(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) {
|
||||||
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
|
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
|
||||||
addCoscoEvaluateTaskVo.setCreateTime(new Date());
|
Date date = new Date();
|
||||||
addCoscoEvaluateTaskVo.setUpdateTime(new Date());
|
addCoscoEvaluateTaskVo.setCreateTime(date);
|
||||||
|
addCoscoEvaluateTaskVo.setUpdateTime(date);
|
||||||
addCoscoEvaluateTaskVo.setId(PropertyUtils.getSnowflakeId());
|
addCoscoEvaluateTaskVo.setId(PropertyUtils.getSnowflakeId());
|
||||||
addCoscoEvaluateTaskVo.setCreateBy(currentUser.getUserId());
|
addCoscoEvaluateTaskVo.setCreateBy(currentUser.getUserId());
|
||||||
addCoscoEvaluateTaskVo.setUpdateBy(currentUser.getUserId());
|
addCoscoEvaluateTaskVo.setUpdateBy(currentUser.getUserId());
|
||||||
|
@ -131,7 +131,7 @@ public class CoscoEvaluateTaskSupplierUserServiceImpl implements ICoscoEvaluateT
|
|||||||
//根据人员信息进行封装
|
//根据人员信息进行封装
|
||||||
coscoEvaluateTemplateIndicatorSts.forEach(st->{
|
coscoEvaluateTemplateIndicatorSts.forEach(st->{
|
||||||
List<TaskSubIndicatorVo> collect = coscoEvaluateScorings.stream().filter(scoring -> scoring.getStId().equals(st.getId())).collect(Collectors.toList());
|
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();
|
TaskIndicatorVo vo=new TaskIndicatorVo();
|
||||||
vo.setBaseIndicator(st.getBaseIndicator());
|
vo.setBaseIndicator(st.getBaseIndicator());
|
||||||
vo.setIndicatorDesc(st.getDescIndicator());
|
vo.setIndicatorDesc(st.getDescIndicator());
|
||||||
|
@ -1,23 +1,22 @@
|
|||||||
package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl;
|
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.coscoEvaluate.dao.CoscoEvaluateTemplateIndicatorStMapper;
|
||||||
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTemplateIndicatorNd;
|
||||||
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTemplateIndicatorSt;
|
||||||
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTemplateIndicatorNdService;
|
||||||
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTemplateIndicatorStService;
|
||||||
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.AddCoscoEvaluateTemplateVo;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.stream.Collectors;
|
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;
|
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTemplateIndicatorNdService;
|
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.AddCoscoEvaluateTemplateVo;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateTemplateIndicatorStMapper;
|
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTemplateIndicatorSt;
|
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTemplateIndicatorStService;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 【供应商评价_评价表模板一级指标项表】Service业务层处理
|
* 【供应商评价_评价表模板一级指标项表】Service业务层处理
|
||||||
*
|
*
|
||||||
|
@ -1,29 +1,26 @@
|
|||||||
package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl;
|
package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl;
|
||||||
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
|
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
|
||||||
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
|
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
|
||||||
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
|
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.CoscoEvaluateTemplateMapper;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryVO;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTemplate;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTemplateIndicatorSt;
|
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTemplateIndicatorStService;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTemplateIndicatorStService;
|
||||||
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTemplateService;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.AddCoscoEvaluateTemplateVo;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.AddCoscoEvaluateTemplateVo;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTemplateVo;
|
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTemplateVo;
|
||||||
import org.apache.commons.beanutils.BeanUtils;
|
import org.apache.commons.beanutils.BeanUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateTemplateMapper;
|
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTemplate;
|
|
||||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTemplateService;
|
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
|
import java.lang.reflect.InvocationTargetException;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 【供应商评价_评价表模板主表】Service业务层处理
|
* 【供应商评价_评价表模板主表】Service业务层处理
|
||||||
*
|
*
|
||||||
@ -82,10 +79,11 @@ public class CoscoEvaluateTemplateServiceImpl implements ICoscoEvaluateTemplateS
|
|||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public int insertCoscoEvaluateTemplate(AddCoscoEvaluateTemplateVo templateVo) {
|
public int insertCoscoEvaluateTemplate(AddCoscoEvaluateTemplateVo templateVo) {
|
||||||
|
Date date = new Date();
|
||||||
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
|
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
|
||||||
templateVo.setCreateTime(new Date());
|
templateVo.setCreateTime(date);
|
||||||
templateVo.setId(PropertyUtils.getSnowflakeId());
|
templateVo.setId(PropertyUtils.getSnowflakeId());
|
||||||
templateVo.setUpdateTime(new Date());
|
templateVo.setUpdateTime(date);
|
||||||
templateVo.setCreateBy(currentUser.getUserId());
|
templateVo.setCreateBy(currentUser.getUserId());
|
||||||
templateVo.setUpdateBy(currentUser.getUserId());
|
templateVo.setUpdateBy(currentUser.getUserId());
|
||||||
coscoEvaluateTemplateMapper.insertCoscoEvaluateTemplate(templateVo);
|
coscoEvaluateTemplateMapper.insertCoscoEvaluateTemplate(templateVo);
|
||||||
@ -140,6 +138,7 @@ public class CoscoEvaluateTemplateServiceImpl implements ICoscoEvaluateTemplateS
|
|||||||
IPage<CoscoEvaluateTemplateVo> p = new Page<>(template.getBasePageRequest().getPageNo(),
|
IPage<CoscoEvaluateTemplateVo> p = new Page<>(template.getBasePageRequest().getPageNo(),
|
||||||
template.getBasePageRequest().getPageSize());
|
template.getBasePageRequest().getPageSize());
|
||||||
IPage<CoscoEvaluateTemplateVo> coscoEvaluateTemplateVoIPage = coscoEvaluateTemplateMapper.selectMyPage(p, template);
|
IPage<CoscoEvaluateTemplateVo> coscoEvaluateTemplateVoIPage = coscoEvaluateTemplateMapper.selectMyPage(p, template);
|
||||||
|
//TODO 人员添加
|
||||||
List<String> creaters = new ArrayList<>();
|
List<String> creaters = new ArrayList<>();
|
||||||
coscoEvaluateTemplateVoIPage.getRecords().forEach(vo -> {
|
coscoEvaluateTemplateVoIPage.getRecords().forEach(vo -> {
|
||||||
creaters.add(vo.getCreateBy());
|
creaters.add(vo.getCreateBy());
|
||||||
|
Reference in New Issue
Block a user