ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ApprovalController.java

@@ -100,6 +100,7 @@ public class ApprovalController extends BaseController {
         tProjectPool.setApprovalFlag("0");//未发起立项的
         tProjectPool.setStatus(3);//项目机会流程状态为审批通过
         tProjectPool.setProjectStatus(tProjectPool.getProjectStatus());
+        tProjectPool.setTerminationFlag("0");//未发起终止的
         List<TProjectPool> list = investmentOpportunityService.selectApplicableProjectList(tProjectPool)
                 .stream().map(n -> {
                     n.settProjectMeeting(tProjectMeetingService.listProjectPoolIdNew(n.getId(),"LX"));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/DecisionController.java

@@ -97,6 +97,7 @@ public class DecisionController extends BaseController {
         tProjectPool.setDecisionFlag("0");//未发起投决
         tProjectPool.setStatus(3);//项目机会流程状态为审批通过
         tProjectPool.setProjectStatus(tProjectPool.getProjectStatus());
+        tProjectPool.setTerminationFlag("0");//未发起终止的
         List<TProjectPool> list = investmentOpportunityService.selectApplicableProjectList(tProjectPool).stream().map(n -> {
             n.settProjectMeeting(tProjectMeetingService.listProjectPoolIdNew(n.getId(),"TJ"));
             if(null != n.gettProjectMeeting()){

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/InvestigateController.java

@@ -98,6 +98,7 @@ public class InvestigateController extends BaseController {
         tProjectPool.setInvestigateFlag("0");//未发起背调的
         tProjectPool.setStatus(3);//项目机会流程状态为审批通过
         tProjectPool.setProjectStatus(tProjectPool.getProjectStatus());
+        tProjectPool.setTerminationFlag("0");//未发起终止的
         List<TProjectPool> list = investmentOpportunityService.selectApplicableProjectList(tProjectPool)
                 .stream().map(n -> {
                     n.settProjectInvestigate(tProjectInvestigateService.listProjectPoolIdNew(n.getId()));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/TerminationController.java

@@ -87,6 +87,7 @@ public class TerminationController extends BaseController {
         startPage();
         //tProjectPool.setProjectStage("5");
         tProjectPool.setDelFlag("0");//
+        tProjectPool.setTerminationFlag("0");//未发起终止的
         tProjectPool.setStatus(3);//项目机会流程状态为审批通过
         tProjectPool.setProjectStatus(tProjectPool.getProjectStatus());//观望
         List<TProjectPool> list = investmentOpportunityService.selectApplicableProjectList(tProjectPool);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -245,6 +245,7 @@ public class SysUserController extends BaseController
     @GetMapping("/deptTree")
     public AjaxResult deptTree(SysDept dept)
     {
+        dept.setStatus("0");
         return success(deptService.selectDeptTreeList(dept));
     }
 
@@ -257,6 +258,8 @@ public class SysUserController extends BaseController
     public TableDataInfo listUser(SysUser user)
     {
         startPage();
+        user.setDelFlag("0");
+        user.setStatus("0");
         List<SysUser> list = userService.selectUserList(user);
         return getDataTable(list);
     }

ruoyi-admin/src/main/java/com/ruoyi/web/job/ToDoNumberJob.java

@@ -8,6 +8,7 @@ import org.flowable.engine.ProcessEngine;
 import org.flowable.engine.ProcessEngines;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.runtime.ProcessInstance;
+import org.flowable.task.api.Task;
 import org.flowable.task.api.TaskQuery;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,17 +50,25 @@ public class ToDoNumberJob {
         //声明map记录用户和对应的代办数量
         Map<String,Integer> map = new HashMap<>();
         for (ProcessInstance instance : instances) {
-            TaskQuery query = engine.getTaskService().createTaskQuery()
+           /* TaskQuery query = engine.getTaskService().createTaskQuery()
                     .processInstanceId(instance.getId());
             //获取对应的待处理用户记录代办数量+1
-            String assignee = query.singleResult().getAssignee();
-            if(assignee!=null && !"".equals(assignee)){
-                //根据用户id获取用户对象
-                SysUser userInfo= sysUserService.selectUserById(Long.parseLong(assignee));
-                if (map.containsKey(userInfo.getUserName())){
-                    map.put(userInfo.getUserName(),map.get(userInfo.getUserName())+1);
-                }else {
-                    map.put(userInfo.getUserName(),1);
+            String assignee = query.singleResult().getAssignee();*/
+            List<Task> taskList = engine.getTaskService().createTaskQuery()
+                    .processInstanceId(instance.getId())
+                    .list();
+            // 遍历所有任务，获取每个处理人
+            for (Task task : taskList) {
+                String assignee = task.getAssignee();
+                // 处理每个处理人...
+                if(assignee!=null && !"".equals(assignee)){
+                    //根据用户id获取用户对象
+                    SysUser userInfo= sysUserService.selectUserById(Long.parseLong(assignee));
+                    if (map.containsKey(userInfo.getUserName())){
+                        map.put(userInfo.getUserName(),map.get(userInfo.getUserName())+1);
+                    }else {
+                        map.put(userInfo.getUserName(),1);
+                    }
                 }
             }
         }

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/DecisionServiceImpl.java

@@ -198,6 +198,7 @@ public class DecisionServiceImpl extends FlowServiceFactory implements IDecision
                     tProjectPool.setId(tProjectDecision.getProjectPoolId());
                     tProjectPool.setProjectStage("5");//项目阶段-项目投决
                     tProjectPool.setProjectState("h");//项目状态-准备项目投决材料
+                    tProjectPool.setProjectStatus("0");//项目机会状态-正常
                     tProjectPoolService.updateTProjectPool(tProjectPool);
                     // todo 短信
                     //sendMessage(flowBaseInfo,"");

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/InvestigateServiceImpl.java

@@ -189,6 +189,7 @@ public class InvestigateServiceImpl extends FlowServiceFactory implements IInves
                     tProjectPool.setId(tProjectInvestigate.getProjectPoolId());
                     tProjectPool.setProjectStage("4");//项目阶段-尽职背调
                     tProjectPool.setProjectState("f");//项目状态-尽职背调
+                    tProjectPool.setProjectStatus("0");//项目机会状态-正常
                     tProjectPoolService.updateTProjectPool(tProjectPool);
                     //todo 短信
                     //sendMessage(flowBaseInfo,"");

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/TerminationServiceImpl.java

@@ -154,8 +154,9 @@ public class TerminationServiceImpl extends FlowServiceFactory implements ITermi
 
                     // todo 增加项目创建记录
                     tProjectCirculationService.insertTProjectCirculation(tProjectTermination.getProjectPoolId(),"终止申请",nickName);
-
-                    /*tProjectTerminationService.insertTProjectTermination(tProjectTermination);*/
+                    // todo 更改终止状态
+                    tProjectPoolService.updateTProjectPoolByTerminationFlag(tProjectTermination.getProjectPoolId(),"1");//1是代表已发起终止申请
+                    // todo 新增终止数据
                     terminationMapper.insertTProjectTermination(tProjectTermination);
 
 
@@ -172,10 +173,11 @@ public class TerminationServiceImpl extends FlowServiceFactory implements ITermi
                     flowBaseInfo.setStatus(FlowStatusEnum.STARTED.getName());
                     flowBaseInfo.setFlag(tProjectTermination.isFlag());
                     activitiBaseInfoService.addActivitiBaseInfo(flowBaseInfo);
+
                     TProjectPool tProjectPool=new TProjectPool();
                     tProjectPool.setId(tProjectTermination.getProjectPoolId());
-                    tProjectPool.setProjectStage("8");//项目阶段-项目终止
-                    tProjectPool.setProjectState("o");//项目状态-项目终止
+//                    tProjectPool.setProjectStage("8");//项目阶段-项目终止
+//                    tProjectPool.setProjectState("o");//项目状态-项目终止
                     tProjectPoolService.updateTProjectPool(tProjectPool);
                     // todo 短信
                     //sendMessage(flowBaseInfo);
@@ -258,6 +260,8 @@ public class TerminationServiceImpl extends FlowServiceFactory implements ITermi
                     tProjectPool.setProjectStatus("1");//项目机会状态为终止
                     // todo 增加项目创建记录
                     tProjectCirculationService.insertTProjectCirculation(tProjectPool.getId(),"项目终止完成", userInfo.getNickName());
+                }else{
+                    tProjectPool.setTerminationFlag("0");
                 }
             }
             tProjectPoolService.updateTProjectPool(tProjectPool);

ruoyi-system/src/main/java/com/ruoyi/invest/domain/TProjectPool.java

@@ -218,6 +218,10 @@ public class TProjectPool extends BaseEntity
      * 投决申请状态
      */
     private String decisionFlag;
+    /**
+     * 终止申请状态
+     */
+    private String terminationFlag;
     /**
      * 流程状态
      */
@@ -620,6 +624,14 @@ public class TProjectPool extends BaseEntity
         this.decisionFlag = decisionFlag;
     }
 
+    public String getTerminationFlag() {
+        return terminationFlag;
+    }
+
+    public void setTerminationFlag(String terminationFlag) {
+        this.terminationFlag = terminationFlag;
+    }
+
     public TProjectInvestigatePerson gettProjectInvestigatePerson() {
         return tProjectInvestigatePerson;
     }

ruoyi-system/src/main/java/com/ruoyi/invest/domain/vo/TProjectPoolVo.java

@@ -219,6 +219,10 @@ public class TProjectPoolVo extends BaseEntity
      * 投决申请状态
      */
     private String decisionFlag;
+    /**
+     * 终止申请状态
+     */
+    private String terminationFlag;
     /**
      * 流程状态
      */

ruoyi-system/src/main/java/com/ruoyi/invest/mapper/TProjectPoolMapper.java

@@ -115,6 +115,14 @@ public interface TProjectPoolMapper
      */
     int updateTProjectPoolByDecisionFlag(@Param("id") String id,@Param("flag") String flag);
 
+    /**
+     * 修改终止状态
+     * @param id
+     * @param flag
+     * @return
+     */
+    int updateTProjectPoolByTerminationFlag(@Param("id") String id,@Param("flag") String flag);
+
     /**
      * 修改终止状态
      * @param id

ruoyi-system/src/main/java/com/ruoyi/invest/service/ITProjectPoolService.java

@@ -114,6 +114,14 @@ public interface ITProjectPoolService
      */
     int updateTProjectPoolByDecisionFlag(String id,String flag);
 
+    /**
+     * 修改终止状态
+     * @param id
+     * @param flag
+     * @return
+     */
+    int updateTProjectPoolByTerminationFlag(String id,String flag);
+
     /**
      * 修改投决状态
      * @param id

ruoyi-system/src/main/java/com/ruoyi/invest/service/impl/TProjectPoolServiceImpl.java

@@ -170,6 +170,16 @@ public class TProjectPoolServiceImpl implements ITProjectPoolService
     public int updateTProjectPoolByDecisionFlag(String id, String flag) {
         return tProjectPoolMapper.updateTProjectPoolByDecisionFlag(id,flag);
     }
+    /**
+     * 修改终止状态
+     * @param id
+     * @param flag
+     * @return
+     */
+    @Override
+    public int updateTProjectPoolByTerminationFlag(String id, String flag) {
+        return tProjectPoolMapper.updateTProjectPoolByTerminationFlag(id,flag);
+    }
 
     /**
      * 修改投决状态

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

@@ -57,7 +57,8 @@ public class SysDeptServiceImpl implements ISysDeptService
     @Override
     public List<TreeSelect> selectDeptTreeList(SysDept dept)
     {
-        List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
+        //List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
+        List<SysDept> depts = deptMapper.selectDeptList(dept);
         return buildDeptTreeSelect(depts);
     }
 

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

@@ -71,7 +71,6 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 用户信息集合信息
      */
     @Override
-    @DataScope(deptAlias = "d", userAlias = "u")
     public List<SysUser> selectUserList(SysUser user)
     {
         return userMapper.selectUserList(user);

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -242,6 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		WHERE (d.dept_name like concat('%',#{deptName},'%')
 		  or d.dept_name like concat('%',#{deptName1},'%'))
 		  and d.status=0 and d.del_flag=0
+		  and u.status=0 and u.del_flag=0
 	</select>
 	
 </mapper> 

ruoyi-ui/src/views/project/poolDetail.vue

@@ -4,9 +4,17 @@
       <div class="public-margin-r-20">
         <h4>
           投资项目
-          <span class="alreadyStop" v-if="detailInfo.delFlag === '1'"
+<!--          <span class="alreadyStop" v-if="detailInfo.delFlag === '1'"
           >已终止</span
-          >
+          >-->
+          <span class="alreadyStop"
+                v-if="detailInfo.terminationFlag === '1' && detailInfo.projectStatus !== '1'">
+            已发起终止申请
+          </span>
+                  <span class="alreadyStop"
+                        v-if="detailInfo.projectStatus === '1'">
+            已终止
+          </span>
         </h4>
         <p class="projectNameTit">{{ detailInfo.projectName }}</p>
       </div>