diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/ScheduledTasksController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/ScheduledTasksController.java index 1c2b8a5..877731c 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/ScheduledTasksController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/ScheduledTasksController.java @@ -16,6 +16,9 @@ public class ScheduledTasksController { public void checkTask() { scheduledTasksService.checkTask(); } - + @RequestMapping("/closeTask") + public void close() { + scheduledTasksService.closeTask(); + } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskDeptWeightMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskDeptWeightMapper.java index e56c26b..b9c3f32 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskDeptWeightMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskDeptWeightMapper.java @@ -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 selectByTaskId(List taskIds); + List selectByTaskId(@Param("taskIds")List taskIds); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java index 81f38cd..5a89760 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java @@ -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 user = userService.getUser(new SelectUserVo()); //给人员添加部门信息 - Map userMap = user.stream().collect(Collectors.toMap(UserVo::getUserId, UserVo::getUserDeptId)); + Map 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())); }); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierDimensionVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierDimensionVo.java index a682d78..6eb5a7b 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierDimensionVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierDimensionVo.java @@ -78,7 +78,7 @@ public class SupplierDimensionVo implements Serializable { /** * 分数 */ - private String suscore; + private Integer suScore; private String categoryName; diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateScoringMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateScoringMapper.xml index 14c32c9..ae1ccdf 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateScoringMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateScoringMapper.xml @@ -192,7 +192,7 @@