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

Merge remote-tracking branch '99/dev' into 99dev

Browse Source
This commit is contained in:
TL
2025-07-16 10:56:21 +08:00
parent 19d3c883fa 9ba13f6f06
commit 981df09afa
17 changed files with 66 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,7 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua
//返回封装
AnnualreviewTaskSupplierUserInfoVo vo = new AnnualreviewTaskSupplierUserInfoVo();
vo.setId(id);
vo.setSupplierId(coscoAnnualreviewTaskSupplierUser.getSupplierId());
vo.setName(baseCategoryNameVo.getName());
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
//TODO 待完善，部门名称

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserInfoVo.java
View File

@ -47,6 +47,8 @@ public class AnnualreviewTaskSupplierUserInfoVo implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endTime;
private String supplierId;
/**
* 打分项集合

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/ScheduledTasksController.java
View File

@ -16,6 +16,9 @@ public class ScheduledTasksController {
public void checkTask() {
scheduledTasksService.checkTask();
}
@RequestMapping("/closeTask")
public void close() {
scheduledTasksService.closeTask();
}
}

3
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskDeptWeightMapper.java
View File

@ -1,6 +1,7 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskDeptWeight;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -72,5 +73,5 @@ public interface CoscoEvaluateTaskDeptWeightMapper {
* @param taskIds
* @return
*/
List<CoscoEvaluateTaskDeptWeight> selectByTaskId(List<String> taskIds);
List<CoscoEvaluateTaskDeptWeight> selectByTaskId(@Param("taskIds")List<String> taskIds);
}

32
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierServiceImpl.java
View File

@ -1,20 +1,24 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.coscoEvaluate.dao.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskSupplierService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.SupplierDimensionVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskIndicatorBaseVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskIndicatorVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskSubIndicatorVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.BaseCategoryNameVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskSupplierService;
import java.util.*;
import java.util.stream.Collectors;
/**
* 【供应商评价_评价任务关联供应商表】Service业务层处理
@ -36,6 +40,8 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS
private CoscoEvaluateScoringResultMapper coscoEvaluateScoringResultMapper;
@Autowired
private CoscoEvaluateTemplateIndicatorNdMapper coscoEvaluateTemplateIndicatorNdMapper;
@Autowired
private IUserService userService;
/**
* 查询【供应商评价_评价任务关联供应商表】
@ -116,9 +122,19 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS
IPage<SupplierDimensionVo> p = new Page<>(vo.getBasePageRequest().getPageNo(),
vo.getBasePageRequest().getPageSize());
IPage<SupplierDimensionVo> supplierDimensionVoIPage = coscoEvaluateTaskSupplierMapper.selectSupplierDimensionPage(p, vo);
List<UserVo> user = userService.getUser(new SelectUserVo());
Map<String ,UserVo> map = new HashMap<>();
user.forEach(userVo -> {
map.put(userVo.getUserId(), userVo);
});
List<String> deptIds = new ArrayList<>();
supplierDimensionVoIPage.getRecords().forEach(item -> {
deptIds.add(item.getDeptId());
UserVo userVo = map.get(item.getUserId());
if(userVo!=null){
item.setUserName(userVo.getUserName());
item.setDeptName(userVo.getUserDept());
}
});
//根据部门id查询评价单位
return supplierDimensionVoIPage;

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

@ -19,12 +19,10 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
@Service
@ -69,6 +67,7 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
*/
@Scheduled(cron = "0 0 2 * * ?")
@Override
@Transactional(rollbackFor = Exception.class)
public void closeTask() {
//查询小于当前时间 未关闭任务
//获取当前时间指标信息
@ -100,7 +99,10 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
//获取人员信息
List<UserVo> user = userService.getUser(new SelectUserVo());
//给人员添加部门信息
Map<String, String> userMap = user.stream().collect(Collectors.toMap(UserVo::getUserId, UserVo::getUserDeptId));
Map<String, String> userMap=new HashMap<>();
user.forEach(userVo -> {
System.out.println(userVo.getUserId());
userMap.put(userVo.getUserId(), userVo.getUserDeptId());});
calculateAndObtainScoresVos.forEach(vos -> {
vos.setDeptId(userMap.get(vos.getUserId()));
});

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierDimensionVo.java
View File

@ -65,6 +65,10 @@ public class SupplierDimensionVo implements Serializable {
* 人员id
*/
private String userId;
/**
* 人员名称
*/
private String userName;
/**
* 任务id
@ -78,10 +82,11 @@ public class SupplierDimensionVo implements Serializable {
/**
* 分数
*/
private String suscore;
private Integer suScore;
private String categoryName;
@ApiModelProperty(value = "分页对象信息")
private BasePageRequest basePageRequest;
}

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierAnnualReviewStatisticsVo.java
View File

@ -46,6 +46,8 @@ public class SupplierAnnualReviewStatisticsVo {
*/
@ExcelProperty("评价年度")
private String annualreviewYear;
private String supplierId;
/**
* 评价结果
*/

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierExitStatisticsVo.java
View File

@ -43,6 +43,8 @@ public class SupplierExitStatisticsVo {
@ExcelProperty("退出时间")
private String applyTime;
private String supplierId;
@ApiModelProperty(value = "分页对象信息")
private BasePageRequest basePageRequest;
}

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierQualificationExpireVo.java
View File

@ -58,6 +58,8 @@ public class SupplierQualificationExpireVo {
@ExcelProperty("分类名称")
private String categoryName;
private String supplierId;
@ApiModelProperty(value = "分页对象信息")
private BasePageRequest basePageRequest;
}