1.流程引擎优化测试

2.新版WebSocket消息推送功能
3.添加物资领用流程
4.入职，离职 流程
5.内部积分兑换，限制相关用户类型

willalp-admin/src/main/java/com/willalp/web/controller/app/AppThreeController.java

@@ -61,6 +61,7 @@ public class AppThreeController extends BaseController {
 
     @RequestMapping("/ccRecord")
     public TableDataInfo getCcRecord(HttpServletRequest request) {
+        startPage();
         return getDataTable(flowCcService.selectHsFlowCcListByUserId(request.getHeader("UserName")));
     }
 

willalp-admin/src/main/resources/application.yml

@@ -21,7 +21,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: dev
+    active: prod
   # 文件上传
   servlet:
     multipart:

willalp-app/src/main/java/com/willalp/app/mapper/xml/HsAppHomeDataMapper.xml

@@ -54,6 +54,7 @@
                   and home_group_type = #{homeGroupType}
             </if>
         </where>
+        order by update_time desc
     </select>
     <select id="selectAppConfigVo" flushCache="true" resultType="com.willalp.app.domain.vo.HsAppHomeDataVo">
         SELECT home_content_id,

willalp-app/src/main/java/com/willalp/app/service/impl/HsAppHomeDataServiceImpl.java

@@ -1,7 +1,6 @@
 package com.willalp.app.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.thread.NamedThreadFactory;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -21,10 +20,6 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 
 /**
  * app首页数据Service业务层处理
@@ -34,16 +29,6 @@ import java.util.concurrent.TimeUnit;
  */
 @Service
 public class HsAppHomeDataServiceImpl extends ServiceImpl<HsAppHomeDataMapper, HsAppHomeData> implements IHsAppHomeDataService {
-    /**
-     * 控制线程数，最优选择是处理器线程数*3
-     */
-    private final static int THREAD_COUNT = 12;
-    /**
-     * 线程池
-     */
-    ExecutorService threadPool = new ThreadPoolExecutor(THREAD_COUNT, 800,
-            10, TimeUnit.SECONDS,
-            new SynchronousQueue<>(), new NamedThreadFactory("AppConfig", false));
     @Resource
     private HsAppHomeDataMapper hsAppHomeDataMapper;
 

willalp-clocking-in/src/main/java/com/willalp/flow/service/impl/HsFlowEngineServiceImpl.java

@@ -325,6 +325,8 @@ public class HsFlowEngineServiceImpl implements HsFlowEngineService {
                 HsFlowBase nextFlowBase = flowBaseService.getFlowTaskBaseByGroupIdAndBaseId(hsFlowTask.getBaseGroupId(), flowBase.getDownStepId());
                 if (nextFlowBase != null && nextFlowBase.getModelType().equals(APPROVAL)) {
                     hsFlowTask.setIsCandidate(ZERO);
+                } else {
+                    hsFlowTask.setIsCandidate(ONE);
                 }
             } else {
                 hsFlowTask.setIsCandidate(ONE);
@@ -454,7 +456,7 @@ public class HsFlowEngineServiceImpl implements HsFlowEngineService {
                         appUserMsg.setUserCode(postTreeVo.getValue());
                         appUserMsg.setMsgType(SEVEN);
                         appUserMsg.setIsPush(ZERO);
-                        appUserMsg.setRemark(frrCc.getId());
+                        appUserMsg.setRemark(cc.getId());
                         appUserMsg.setCreateTime(new Date());
                         msgs.add(appUserMsg);
                         if (StringUtils.isBlank(base.getDownStepId())) {

willalp-ui/src/views/home/news/index.vue

@@ -314,7 +314,7 @@ export default {
         link: "",
         imgPath: null,
         homeGroupType: type + 1,
-        updateTime: '',
+        updateTime: this.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}') ,
       })
       /*使用变异的 .splice(起点（下标）,终点（下标）,newValue) 方法
         替换 list[type]中的数据 触发 Vue.set()方法让Dom元素响应该改变视图