fix 修改定时多线程

ruoyi-system/src/main/java/com/ruoyi/system/domain/activity/ZxActivity.java

@@ -27,8 +27,8 @@ public class ZxActivity extends BaseEntity
     private String activityTitle;
 
     /** 活动日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "活动日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "活动日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date activityDate;
 
     /** 活动时间 */

ruoyi-system/src/main/java/com/ruoyi/system/domain/investment/ZxInvestment.java

@@ -53,8 +53,8 @@ public class ZxInvestment extends BaseEntity
     private String type;
 
     /** 录入时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "录入时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "录入时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date publishTime;
 
     public String getType() {

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskService.java

@@ -34,7 +34,7 @@ import static com.ruoyi.common.constant.CommonConstants.*;
  * @Describe:
  */
 @Service
-public class TaskService extends Thread{
+public class TaskService extends Thread {
     @Autowired
     private MemberInfoMapper memberInfoMapper;
     @Autowired
@@ -363,7 +363,7 @@ public class TaskService extends Thread{
                     if (zxInvestments != null && zxInvestments.size() > 0) {
                         //定义当前分数
                         nowScore = 0L;
-                        //获取分值上限
+                        //获取加分分值上限
                         assessmentTotal = zxAssessments.stream().filter(e -> "assessment_bonus".equals(e.getAssessmentProjectId()) && 0 == e.getParentId()).collect(Collectors.toList())
                                 .get(0).getAssessmentTotal();
                         //去查询这个是否有有效的招商线索
@@ -390,7 +390,7 @@ public class TaskService extends Thread{
                         if (nowScore > assessmentTotal) {
                             nowScore = assessmentTotal;
                         }
-                        memberAssessmentInf.setActivityScore(nowScore);
+                        memberAssessmentInf.setInvestmentScore(nowScore);
                         //计算满分上限
                         fullScore = fullScore + assessmentTotal;
                     }
@@ -399,8 +399,14 @@ public class TaskService extends Thread{
                     zxBonus.setUserId(userId);
                     List<ZxBonus> zxBonuses = zxBonusMapper.selectZxBonusList(zxBonus);
                     if (zxBonuses != null && zxBonuses.size() > 0) {
-                        long bonusScore = zxBonuses.stream().filter(e -> e.getScore() != null).mapToLong(BaseEntity::getScore).sum();
-                        memberAssessmentInf.setBonusScore(bonusScore);
+                        //总加分包括招商加分
+                        long bonusScore = zxBonuses.stream().filter(e -> e.getScore() != null).mapToLong(BaseEntity::getScore).sum() + memberAssessmentInf.getInvestmentScore();
+                        //获取加分分值上限
+                        assessmentTotal = zxAssessments.stream().filter(e -> "assessment_bonus".equals(e.getAssessmentProjectId()) && 0 == e.getParentId()).collect(Collectors.toList())
+                                .get(0).getAssessmentTotal();
+                        if (bonusScore > assessmentTotal) {
+                            memberAssessmentInf.setBonusScore(assessmentTotal);
+                        }
                     }
                     memberAssessmentInf.setFullScore(fullScore);
                 }
@@ -424,7 +430,7 @@ public class TaskService extends Thread{
             List<List<MemberAssessmentInfo>> lists = BranchThreadUtils.splitList(collect, count);
             for (List<MemberAssessmentInfo> list : lists) {
                 executor.execute(() -> {
-                    System.out.println("线程"+Thread.currentThread().getId()+"启动");
+                    System.out.println("线程" + Thread.currentThread().getId() + "启动");
                     //计算排名
                     int index = 0;
                     //最近的一次分数

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZxInvestmentServiceImpl.java

@@ -58,6 +58,7 @@ public class ZxInvestmentServiceImpl implements IZxInvestmentService {
         zxInvestment.setUserId(SecurityUtils.getUserId());
         zxInvestment.setName(SecurityUtils.getUsername());
         zxInvestment.setCreateTime(DateUtils.getNowDate());
+        zxInvestment.setPublishTime(DateUtils.getNowDate());
         return zxInvestmentMapper.insertZxInvestment(zxInvestment);
     }