储备项目新-工作流代码提交

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -3,13 +3,16 @@
  */
 package com.jeeplus.modules.act.service;
 
-import java.io.InputStream;
-import java.util.*;
-
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.jeeplus.common.utils.DateUtils;
-import com.jeeplus.common.utils.SpringContextHolder;
-import com.jeeplus.modules.oa.entity.OaNotify;
-import com.jeeplus.modules.oa.entity.OaNotifyRecord;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.service.BaseService;
+import com.jeeplus.modules.act.entity.Act;
+import com.jeeplus.modules.act.mapper.ActMapper;
+import com.jeeplus.modules.act.utils.ActUtils;
+import com.jeeplus.modules.act.utils.ProcessDefCache;
 import com.jeeplus.modules.oa.service.OaNotifyService;
 import com.jeeplus.modules.sg.advence.activiti.entity.Advance;
 import com.jeeplus.modules.sg.advence.activiti.service.AdvanceService;
@@ -24,27 +27,18 @@ import com.jeeplus.modules.sg.managementcenter.materialproject.entity.MaterialPr
 import com.jeeplus.modules.sg.managementcenter.materialproject.mapper.MaterialProjectMapper;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
-import com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule;
 import com.jeeplus.modules.sg.materialmodule.activiti.service.MaterialModuleService;
-import com.jeeplus.modules.sg.materialmodule.activiti.service.NonPowerService;
 import com.jeeplus.modules.sg.picking.activiti.entity.MaterialReport;
 import com.jeeplus.modules.sg.picking.activiti.entity.PickApplication;
 import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
 import com.jeeplus.modules.sg.picking.activiti.service.PickIngService;
 import com.jeeplus.modules.sg.picking.activiti.service.ShowListService;
+import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.utils.UserUtils;
 import org.activiti.bpmn.model.BpmnModel;
-import org.activiti.engine.FormService;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.IdentityService;
-import org.activiti.engine.RepositoryService;
-import org.activiti.engine.RuntimeService;
-import org.activiti.engine.TaskService;
+import org.activiti.engine.*;
 import org.activiti.engine.delegate.Expression;
-import org.activiti.engine.history.HistoricActivityInstance;
-import org.activiti.engine.history.HistoricProcessInstance;
-import org.activiti.engine.history.HistoricProcessInstanceQuery;
-import org.activiti.engine.history.HistoricTaskInstance;
-import org.activiti.engine.history.HistoricTaskInstanceQuery;
+import org.activiti.engine.history.*;
 import org.activiti.engine.impl.RepositoryServiceImpl;
 import org.activiti.engine.impl.bpmn.behavior.UserTaskActivityBehavior;
 import org.activiti.engine.impl.context.Context;
@@ -76,19 +70,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.core.persistence.Page;
-import com.jeeplus.core.service.BaseService;
-import com.jeeplus.modules.act.entity.Act;
-import com.jeeplus.modules.act.mapper.ActMapper;
-import com.jeeplus.modules.act.utils.ActUtils;
-import com.jeeplus.modules.act.utils.ProcessDefCache;
-import com.jeeplus.modules.sys.entity.User;
-import com.jeeplus.modules.sys.utils.UserUtils;
-
-import javax.servlet.ServletContext;
+import java.io.InputStream;
+import java.util.*;
 
 /**
  * 流程定义相关Service
@@ -348,10 +331,11 @@ public class ActTaskService extends BaseService {
         String userId = UserUtils.getUser().getLoginName();//ObjectUtils.toString(UserUtils.getUser().getId());
 
 
-        // =============== 已经签收的任务  ===============
+        /*// =============== 已经签收的任务  ===============
         TaskQuery todoTaskQuery = taskService.createTaskQuery().taskAssignee(userId).active()
                 .includeProcessVariables().orderByTaskCreateTime().desc();
 
+
         // 设置查询条件
         if (StringUtils.isNotBlank(act.getProcDefKey())) {
             todoTaskQuery.processDefinitionKey(act.getProcDefKey());
@@ -361,7 +345,7 @@ public class ActTaskService extends BaseService {
         }
         if (act.getEndDate() != null) {
             todoTaskQuery.taskCreatedBefore(act.getEndDate());
-        }
+        }*/
 
 
         // =============== 等待签收的任务  ===============
@@ -379,9 +363,10 @@ public class ActTaskService extends BaseService {
             toClaimQuery.taskCreatedBefore(act.getEndDate());
         }
 
-        long taskCount = todoTaskQuery.count();
+//        long taskCount = todoTaskQuery.count();
         long claimCount = toClaimQuery.count();
-        long total = taskCount + claimCount;
+//        long total = taskCount + claimCount;
+        long total = claimCount;
         page.setCount(total);
 
 
@@ -392,17 +377,22 @@ public class ActTaskService extends BaseService {
         // 查询列表
         List<Task> toClaimList = Lists.newArrayList();
         if (end == -1) {//不分页
-            todoList = todoTaskQuery.list();
+//            todoList = todoTaskQuery.list();
             toClaimList = toClaimQuery.list();
         } else {
 
-            if (end <= taskCount) {
+            /*if (end <= taskCount) {
                 todoList = todoTaskQuery.listPage(start, page.getMaxResults());
             } else if (start < taskCount) {
                 todoList = todoTaskQuery.listPage(start, (int) taskCount - start);
                 toClaimList = toClaimQuery.listPage(0, end - (int) taskCount);
             } else {
                 toClaimList = toClaimQuery.listPage(start - (int) taskCount, page.getMaxResults());
+            }*/
+            if (end <= claimCount){
+                toClaimList = toClaimQuery.listPage(start, page.getMaxResults());
+            }else if (start < claimCount){
+                toClaimList = toClaimQuery.listPage(start, (int) claimCount - start);
             }
         }
 

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/service/ReserveSummaryProcessService.java

@@ -287,14 +287,10 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
         String flag = act.getFlag();
         ReserveProcessProject user = MyActiviUtils.findCgUser(act.getProcInsId());
 
-        String projectReserveId = "";
-        String budgetRevision = "";
+
         //修改储备项目概预算统计表的-是否完成概算修改 和 概算修改完成时间字段
         if ("yes".equals(flag)) {
             vars.put("pass",true);
-            //根据项目储备编号修改 是否完成概算修改状态
-            projectReserveId = reserveProcess.getProjectReserveId();
-            budgetRevision = "无需修改";
 
             //将预算书审前审后数据放入数据库
             BudgetBook budgetBook = new BudgetBook();
@@ -317,9 +313,6 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             String loginNameByName = mapper.getLoginNameByName(user.getDesigner());
             vars.put("manager", loginNameByName);
             vars.put("pass",false);
-            //根据项目储备编号修改 是否完成概算修改状态
-            projectReserveId = reserveProcess.getProjectReserveId();
-            budgetRevision = "修改中";
 
             //将预算问题反馈记录保存到数据库
             FeedBackBudget budget = new FeedBackBudget();