|
|
@@ -0,0 +1,673 @@
|
|
|
+package com.jeeplus.modules.test.service.act;
|
|
|
+
|
|
|
+import com.google.common.collect.Maps;
|
|
|
+import com.jeeplus.common.persistence.Page;
|
|
|
+import com.jeeplus.common.service.CrudService;
|
|
|
+import com.jeeplus.common.utils.MenuStatusEnum;
|
|
|
+import com.jeeplus.common.utils.StringUtils;
|
|
|
+import com.jeeplus.modules.act.service.ActTaskService;
|
|
|
+import com.jeeplus.modules.serialnum.service.SerialNumTplService;
|
|
|
+import com.jeeplus.modules.sys.entity.Office;
|
|
|
+import com.jeeplus.modules.sys.entity.User;
|
|
|
+import com.jeeplus.modules.sys.service.OfficeService;
|
|
|
+import com.jeeplus.modules.sys.utils.UserUtils;
|
|
|
+import com.jeeplus.modules.test.dao.act.ActTestDao;
|
|
|
+import com.jeeplus.modules.test.entity.act.ActTest;
|
|
|
+import com.jeeplus.modules.workactivity.dao.WorkActivityProcessDao;
|
|
|
+import com.jeeplus.modules.workactivity.entity.Activity;
|
|
|
+import com.jeeplus.modules.workactivity.entity.WorkActivityProcess;
|
|
|
+import com.jeeplus.modules.workactivity.service.ActivityService;
|
|
|
+import com.jeeplus.modules.workactivity.service.WorkActivityProcessService;
|
|
|
+import com.jeeplus.modules.workactivitymenu.entity.WorkActivityMenu;
|
|
|
+import com.jeeplus.modules.workactivitymenu.service.WorkActivityMenuService;
|
|
|
+import com.jeeplus.modules.workinvoice.entity.WorkInvoice;
|
|
|
+import com.jeeplus.modules.workinvoicedetail.entity.WorkInvoiceDetail;
|
|
|
+import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
|
|
|
+import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
|
|
|
+import com.jeeplus.modules.workprojectnotify.util.UtilNotify;
|
|
|
+import org.activiti.engine.ActivitiObjectNotFoundException;
|
|
|
+import org.activiti.engine.RuntimeService;
|
|
|
+import org.activiti.engine.runtime.ProcessInstance;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.context.annotation.Lazy;
|
|
|
+import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
+
|
|
|
+import java.util.*;
|
|
|
+
|
|
|
+@Service
|
|
|
+@Transactional(readOnly = false)
|
|
|
+@Lazy
|
|
|
+public class ActTestService extends CrudService<ActTestDao, ActTest> {
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private ActTaskService actTaskService;
|
|
|
+ @Autowired
|
|
|
+ private RuntimeService runtimeService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private ActTestDao actTestDao;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private OfficeService officeService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ protected SerialNumTplService serialNumTplService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ protected WorkActivityProcessService workActivityProcessService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ protected WorkProjectNotifyService workProjectNotifyService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ protected WorkActivityMenuService workActivityMenuService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private ActivityService activityService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private WorkActivityProcessDao workActivityProcessDao;
|
|
|
+
|
|
|
+ private static byte[] SYN_BYTE = new byte[0];
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ public ActTest get(String id){
|
|
|
+ ActTest actTest = new ActTest();
|
|
|
+ actTest=super.get(id);
|
|
|
+ return actTest;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ public Page<ActTest> findPage(Page<ActTest> page,ActTest actTest){
|
|
|
+ if(StringUtils.isNotBlank(actTest.getOfficeId())){
|
|
|
+ //查询该选择节点下所有的部门Id
|
|
|
+ List<String> officeIdList = officeService.getChildrenOffice(actTest.getOfficeId());
|
|
|
+ officeIdList.add(actTest.getOfficeId());
|
|
|
+ actTest.setOfficeIdList(officeIdList);
|
|
|
+ }
|
|
|
+ int count = dao.queryCount(actTest);
|
|
|
+ page.setCount(count);
|
|
|
+ page.setCountFlag(false);
|
|
|
+ actTest.setPage(page);
|
|
|
+ page.setList(dao.findList(actTest));
|
|
|
+ return page;
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ @Transactional(readOnly = false)
|
|
|
+ public void save(ActTest actTest){
|
|
|
+ if (StringUtils.isBlank(actTest.getNumber())) {
|
|
|
+ synchronized (SYN_BYTE) {
|
|
|
+ actTest.setNumber(serialNumTplService.genSerialNum(UserUtils.getSelectCompany(), actTest.SERIAL_BIZCODE));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ super.save(actTest);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Transactional(readOnly = false)
|
|
|
+ public String saveBranch(ActTest actTest, Map<String, Object> variables, String processInstanceId) {
|
|
|
+ if (StringUtils.isBlank(actTest.getNumber())) {
|
|
|
+ synchronized (SYN_BYTE) {
|
|
|
+ actTest.setNumber(serialNumTplService.genSerialNum(UserUtils.getSelectCompany(), actTest.SERIAL_BIZCODE));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ String officeId = UserUtils.getUser().getOffice().getId();
|
|
|
+ Office office = officeService.get(officeId);
|
|
|
+ actTest.setOfficeId(officeId);
|
|
|
+ String companyId = UserUtils.getUser().getCompany().getId();
|
|
|
+ actTest.setCompanyId(companyId);
|
|
|
+ super.save(actTest);
|
|
|
+ String str = "";
|
|
|
+ String title = "流程测试待审批";
|
|
|
+ str = "测试流程申请待审批";
|
|
|
+
|
|
|
+ // 启动流程
|
|
|
+ String businessKey = actTest.getId().toString();
|
|
|
+ WorkActivityMenu workActivityMenu = workActivityMenuService.findByParentAndOffice("ggh3125f1f194c82bdea00005c750905",officeService.get(actTest.getOfficeId()));
|
|
|
+ // 启动流程
|
|
|
+ String processType = workActivityMenu.getProcessType();
|
|
|
+ StringBuffer buffer = new StringBuffer();
|
|
|
+ Activity activity = new Activity();
|
|
|
+ WorkProjectNotify workProjectNotify = UtilNotify
|
|
|
+ .saveNotify(actTest.getId(),
|
|
|
+ null,
|
|
|
+ actTest.getCompanyId(),
|
|
|
+ title,
|
|
|
+ str,
|
|
|
+ "261", //对应之后的判断
|
|
|
+ "0",
|
|
|
+ "待审批",
|
|
|
+ "" //通知角色
|
|
|
+ );
|
|
|
+ long s6=System.currentTimeMillis();
|
|
|
+ List<User> users = new ArrayList<>();
|
|
|
+ //List<User> bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,office.getId(),"5",workInvoice.getCreateBy());
|
|
|
+ //List<User> fpglys = UserUtils.getByRoleActivityEnname("fpgly",3,office.getId(),"5",workInvoice.getCreateBy());
|
|
|
+ //部门主任
|
|
|
+ List<User> bmzr = UserUtils.getByRoleActivityEnname("bmzr",2,office.getId(),"5",actTest.getCreateBy());
|
|
|
+ long s7=System.currentTimeMillis();
|
|
|
+ if (StringUtils.isNotBlank(workActivityMenu.getId())) {
|
|
|
+ workProjectNotify.setNotifyRole("");
|
|
|
+ workActivityMenu = workActivityMenuService.get(workActivityMenu.getId());
|
|
|
+ List<Activity> activities = workActivityMenu.getActivities();
|
|
|
+ for (Activity a : activities) {
|
|
|
+ String encount = a.getEncount();
|
|
|
+ String enlist = a.getEnlist();
|
|
|
+ if (a.getRole()!=null && StringUtils.isNotBlank(a.getRole().getEnname())){
|
|
|
+ List enusers = UserUtils.getByRoleActivityEnnames(a.getRole().getEnname(),office.getId(),"5",actTest.getCreateBy());
|
|
|
+ if (enusers.size()==0){
|
|
|
+ actTest.setStatus("1");//暂存
|
|
|
+ this.save(actTest);
|
|
|
+ return "流程审批人不能为空,角色"+a.getRole().getName()+"下无用户,请联系管理员！";
|
|
|
+ }
|
|
|
+ variables.put(enlist, enusers);
|
|
|
+ variables.put(encount, enusers.size());
|
|
|
+ }
|
|
|
+ if (a.getDelFlag().equals("0") && a.getCount() == 1) {
|
|
|
+ activity = a;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ buffer.append(activity.getRole().getEnname());
|
|
|
+ if (activity != null && StringUtils.isNotBlank(activity.getId())) {
|
|
|
+ //角色审批
|
|
|
+ if (StringUtils.isNotBlank(activity.getRole().getEnname())) {
|
|
|
+ users = UserUtils.getByRoleActivityEnnames(activity.getRole().getEnname(),office.getId(),"5",actTest.getCreateBy());
|
|
|
+ }
|
|
|
+ //人员审批
|
|
|
+ if (StringUtils.isNotBlank(activity.getUser().getId())) {
|
|
|
+ users.add(activity.getUser());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ workProjectNotify.setId("");
|
|
|
+ } else {
|
|
|
+ if (bmzr.size()==0 ){
|
|
|
+ actTest.setStatus("1");//暂存
|
|
|
+ this.save(actTest);
|
|
|
+ }
|
|
|
+ if (bmzr.size()==0){
|
|
|
+ return "流程审批人不能为空,请联系管理员！";
|
|
|
+ }
|
|
|
+ variables.put("bmzrCount",bmzr.size());
|
|
|
+ variables.put("bmzrList",bmzr);
|
|
|
+ processType = "actTest";
|
|
|
+ users.addAll(bmzr);
|
|
|
+ }
|
|
|
+ for (User user : users){
|
|
|
+ workProjectNotify.setUser(user);
|
|
|
+ workProjectNotify.setId("");
|
|
|
+ workProjectNotifyService
|
|
|
+ .save(workProjectNotify);
|
|
|
+ Map<String,Object> extras = new HashMap<>();
|
|
|
+ extras.put("type","7002");
|
|
|
+ extras.put("id",workProjectNotify.getId());
|
|
|
+ extras.put("procDefKey","261");
|
|
|
+ UserUtils.pushInfoToApp(title,str,extras,user.getId());
|
|
|
+ UserUtils.pushIm(user.getId(),str);
|
|
|
+ }
|
|
|
+ variables.put("type", processType);
|
|
|
+ variables.put("busId", businessKey);
|
|
|
+ variables.put("title", "流程测试");//设置标题；
|
|
|
+ long s8=System.currentTimeMillis();
|
|
|
+ ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(processType, businessKey, variables);
|
|
|
+ actTest.setProcessInstance(processInstance);
|
|
|
+ long s9=System.currentTimeMillis();
|
|
|
+ if (StringUtils.isNotBlank(processInstanceId)) {
|
|
|
+ workActivityProcessService.updateProcessInstanceId(processInstance.getId(),processInstanceId);
|
|
|
+ workActivityProcessService.deleteProcessInstanceId(processInstanceId);
|
|
|
+ workActivityProcessService.deleteProcessIdAuditUsers(processInstanceId);
|
|
|
+ }
|
|
|
+ long s10=System.currentTimeMillis();
|
|
|
+ // 更新流程实例ID
|
|
|
+ actTest.setProcessInstanceId(processInstance.getId());
|
|
|
+ actTestDao.updateProcessInstanceId(actTest);
|
|
|
+ //通知添加流程实例ID
|
|
|
+ workProjectNotify.setProcessInstanceId(processInstance.getId());
|
|
|
+ workProjectNotify.setWapBeginDate(new Date());
|
|
|
+ workProjectNotifyService.save(workProjectNotify);
|
|
|
+ List<Activity> list = workActivityMenu.getActivities();
|
|
|
+ long s11=System.currentTimeMillis();
|
|
|
+ if (list != null && list.size() != 0) {
|
|
|
+ workActivityProcessService.saveList(list, processInstance.getId());
|
|
|
+ } else {
|
|
|
+ WorkActivityProcess workActivityProcess = new WorkActivityProcess();
|
|
|
+ workActivityProcess.setProcessKey("actTest");
|
|
|
+ workActivityProcess.setCount(1);
|
|
|
+ workActivityProcess.setProcessInstanceId(processInstance.getId());
|
|
|
+ workActivityProcess.setIsApproval("0");
|
|
|
+ workActivityProcessService.save(workActivityProcess);
|
|
|
+ /*workActivityProcess.setCount(2);
|
|
|
+ workActivityProcess.setId("");
|
|
|
+ workActivityProcessService.save(workActivityProcess);*/
|
|
|
+ workActivityProcessService.insertAuditsByType(bmzr,processInstance.getId(),1,1);
|
|
|
+ //workActivityProcessService.insertAuditsByType(fpglys,processInstance.getId(),2,0);
|
|
|
+ }
|
|
|
+ return "";
|
|
|
+ }
|
|
|
+
|
|
|
+ @Transactional(readOnly = false)
|
|
|
+ public void updateInfo(ActTest actTest) {
|
|
|
+ if (actTest.DEL_FLAG_NORMAL.equals(actTest.getDelFlag())){
|
|
|
+ if (StringUtils.isBlank(actTest.getId())){
|
|
|
+ actTest.preInsert();
|
|
|
+ actTestDao.insert(actTest);
|
|
|
+ }else{
|
|
|
+ actTest.preUpdate();
|
|
|
+ actTestDao.update(actTest);
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ actTestDao.delete(actTest);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 审核流程
|
|
|
+ * @param actTest
|
|
|
+ */
|
|
|
+ @Transactional(readOnly = false)
|
|
|
+ public String auditSaveBranch(ActTest actTest,List<User> auditUsers) {
|
|
|
+ //所属部门
|
|
|
+ Office office = officeService.get(actTest.getOffice().getId());
|
|
|
+ String userName = UserUtils.get(actTest.getCreateBy().getId()).getName();
|
|
|
+ String title = "流程测试";
|
|
|
+ String str = "流程测试";
|
|
|
+ // 对不同环节的业务逻辑进行操作
|
|
|
+ String taskDefKey = actTest.getAct().getTaskDefKey();
|
|
|
+ if("bmzr".equals(taskDefKey)){
|
|
|
+ updateInfo(actTest);
|
|
|
+ actTaskService.claim(actTest.getAct().getTaskId(), UserUtils.getUser().getId());
|
|
|
+ }else if (!"modifyApply".equals(taskDefKey)) {
|
|
|
+ actTaskService.claim(actTest.getAct().getTaskId(), UserUtils.getUser().getId());
|
|
|
+ }else {
|
|
|
+ actTest.getAct().setFlag("yes");
|
|
|
+ updateInfo(actTest);
|
|
|
+ }
|
|
|
+ String comment = "";
|
|
|
+ if (actTest.getStatus().equals("4")){
|
|
|
+ comment = ("yes".equals(actTest.getAct().getFlag())?"[重新申请] ":"[已撤销] ");
|
|
|
+ }else {
|
|
|
+ comment = ("yes".equals(actTest.getAct().getFlag())?"[同意] ":"[驳回] ")+actTest.getAct().getComment();
|
|
|
+ }
|
|
|
+ //yes 的时候状态为审核通过 否则为未通过
|
|
|
+ //2 审核中 4 驳回
|
|
|
+ actTest.setStatus(("yes".equals(actTest.getAct().getFlag()) ? "2" : "4"));
|
|
|
+ Map<String, Object> vars = Maps.newHashMap();
|
|
|
+ //业务逻辑对应的条件表达式
|
|
|
+ String exp = "";
|
|
|
+ String taskCount = "";
|
|
|
+ String notifyRole = "";
|
|
|
+ int key = 0;
|
|
|
+ String enname = "";
|
|
|
+ List<Activity> activitieList = activityService.getByProcessInstanceId(actTest.getProcessInstanceId());
|
|
|
+ WorkActivityMenu workActivityMenu = new WorkActivityMenu();
|
|
|
+ if (activitieList != null && activitieList.size() != 0) {
|
|
|
+ Iterator<Activity> iterator = activitieList.iterator();
|
|
|
+ while (iterator.hasNext()){
|
|
|
+ Activity activityInfo = iterator.next();
|
|
|
+ if (!"actTest".equals(activityInfo.getProcessKey())){
|
|
|
+ iterator.remove();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ workActivityMenu.setProcessType(activitieList.get(0).getProcessKey());
|
|
|
+ workActivityMenu.setActivities(activitieList);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ WorkActivityProcess workActivityProcess = new WorkActivityProcess();
|
|
|
+ WorkActivityProcess selectProcess = new WorkActivityProcess();
|
|
|
+ selectProcess.setProcessInstanceId(actTest.getProcessInstanceId());
|
|
|
+ List<WorkActivityProcess> workActivityProcesses = workActivityProcessService.findList(selectProcess);
|
|
|
+ List<Activity> activities = workActivityMenu.getActivities();
|
|
|
+ if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("actTest")) {
|
|
|
+ key = 1;
|
|
|
+ for (int i = 0; i < workActivityProcesses.size(); i++) {
|
|
|
+ WorkActivityProcess activityProcess = workActivityProcesses.get(i);
|
|
|
+ if (taskDefKey.equals(activityProcess.getActivityTask()) && !taskDefKey.equals("modifyApply")) {
|
|
|
+ taskCount = activityProcess.getCount()+"";
|
|
|
+ workActivityProcess = activityProcess;
|
|
|
+ if (!workActivityProcess.getIsApproval().equals("0")) {
|
|
|
+ workActivityProcess.setId("");
|
|
|
+ }
|
|
|
+ exp = "pass";
|
|
|
+ if (!"yes".equals(actTest.getAct().getFlag())) {
|
|
|
+ actTest.setStatus("4");
|
|
|
+ workActivityProcess.setIsApproval("2");
|
|
|
+ String returnBack = "-1";
|
|
|
+ for (Activity activity : activities) {
|
|
|
+ if (activity.getCount() == activityProcess.getCount()) {
|
|
|
+ notifyRole = activity.getName();
|
|
|
+ returnBack = activity.getReturnBack();
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (returnBack.equals("0")) {
|
|
|
+ workActivityProcess.setId("");
|
|
|
+ }
|
|
|
+
|
|
|
+ } else {
|
|
|
+ workActivityProcess.setIsApproval("1");
|
|
|
+ }
|
|
|
+ }else if(taskDefKey.equals("modifyApply")){
|
|
|
+ taskCount = "0";
|
|
|
+ notifyRole = "调整申请";
|
|
|
+ exp = "pass";
|
|
|
+ workActivityProcess.setId("");
|
|
|
+ workActivityProcess.setCount(0);
|
|
|
+ if (!"yes".equals(actTest.getAct().getFlag())) {
|
|
|
+ actTest.setStatus("3");
|
|
|
+ workActivityProcess.setIsApproval("2");
|
|
|
+ } else {
|
|
|
+ workActivityProcess.setIsApproval("1");
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ workActivityMenu.setProcessType("actTest");
|
|
|
+ for (int i = 0; i < workActivityProcesses.size(); i++) {
|
|
|
+ WorkActivityProcess activityProcess = workActivityProcesses.get(i);
|
|
|
+ String count = activityProcess.getCount() + "";
|
|
|
+ workActivityProcess = activityProcess;
|
|
|
+ if (!workActivityProcess.getIsApproval().equals("0")) {
|
|
|
+ workActivityProcess.setId("");
|
|
|
+ }
|
|
|
+ // 审核环节
|
|
|
+ //if ("bmzr".equals(taskDefKey) && count.contains("1")) {
|
|
|
+ if ("bmzr".equals(taskDefKey) && count.contains("1")) {
|
|
|
+ taskCount = "1";
|
|
|
+ exp = "pass";
|
|
|
+ if ("yes".equals(actTest.getAct().getFlag())) {
|
|
|
+ workActivityProcessService.insertAuditsByType(auditUsers,actTest.getProcessInstanceId(),1,1);
|
|
|
+ notifyRole = "审批通过";
|
|
|
+ workActivityProcess.setIsApproval("1");
|
|
|
+ }else {
|
|
|
+ notifyRole = "调整申请";
|
|
|
+ workActivityProcess.setIsApproval("2");
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ } else if ("modifyApply".equals(taskDefKey)&& count.contains("0")) {
|
|
|
+ taskCount = "0";
|
|
|
+ notifyRole = "部门主任审批";
|
|
|
+ exp = "pass";
|
|
|
+ workActivityProcess.setCount(0);
|
|
|
+ enname = "bmzr";
|
|
|
+ if (!"yes".equals(actTest.getAct().getFlag())) {
|
|
|
+ actTest.setStatus("3");
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ } else if ("apply_end".equals(taskDefKey)) {
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // 设置意见
|
|
|
+ actTest.getAct().setComment(("yes".equals(actTest.getAct().getFlag()) ? "[同意] " : "[驳回] ") + actTest.getAct().getComment());
|
|
|
+ actTest.preUpdate();
|
|
|
+
|
|
|
+ WorkProjectNotify nowWorkProjectNotify = workProjectNotifyService.processingInfo(actTest.getProcessInstanceId());
|
|
|
+
|
|
|
+ // 提交流程任务
|
|
|
+ vars.put(exp, "yes".equals(actTest.getAct().getFlag()) ? true : false);
|
|
|
+ vars.put("passs", true);
|
|
|
+ workActivityProcessService.updateProcess(workActivityProcess,workActivityMenu,key,taskCount,actTest.getProcessInstanceId(),taskDefKey,"modifyApply",actTest.getAct().getFlag(),comment, activities);
|
|
|
+ // 提交流程任务
|
|
|
+ actTaskService.complete(actTest.getAct().getTaskId(), actTest.getAct().getProcInsId(), actTest.getAct().getComment(), vars);
|
|
|
+ boolean state = actTaskService.isProcessEnd(actTest.getAct().getProcInsId());
|
|
|
+ List<User> users = new ArrayList<>();
|
|
|
+ List<User> userList = new ArrayList<>();
|
|
|
+ //ProjectRecords projectRecords = projectRecordsService.getRuralMasters(workInvoice.getProject().getId());
|
|
|
+ if (!state) {
|
|
|
+ users.add(actTest.getCreateBy());
|
|
|
+ if ("yes".equals(actTest.getAct().getFlag())) {
|
|
|
+ title = "流程测试申请通过";
|
|
|
+ actTest.setStatus("5");
|
|
|
+ WorkProjectNotify notify = new WorkProjectNotify();
|
|
|
+ notify.setNotifyId(actTest.getId());
|
|
|
+ userList = workProjectNotifyService.readByNotifyId(notify);
|
|
|
+ workProjectNotifyService
|
|
|
+ .save(UtilNotify
|
|
|
+ .saveNewNotify(actTest.getId(),
|
|
|
+ actTest.getCreateBy(),
|
|
|
+ actTest.getCompanyId(),
|
|
|
+ title,
|
|
|
+ str,
|
|
|
+ "261",
|
|
|
+ "0",
|
|
|
+ "待通知",
|
|
|
+ notifyRole,
|
|
|
+ actTest.getProcessInstanceId(),new Date()));
|
|
|
+
|
|
|
+ } else {
|
|
|
+ WorkProjectNotify notify = new WorkProjectNotify();
|
|
|
+ notify.setNotifyId(actTest.getId());
|
|
|
+ userList = workProjectNotifyService.readByNotifyId(notify);
|
|
|
+ if (StringUtils.isNotBlank(actTest.getStatus()) && !actTest.getStatus().equals("3")){
|
|
|
+ actTest.setStatus("4");
|
|
|
+ workProjectNotifyService
|
|
|
+ .save(UtilNotify
|
|
|
+ .saveNewNotify(actTest.getId(),
|
|
|
+ actTest.getCreateBy(),
|
|
|
+ actTest.getCompanyId(),
|
|
|
+ title,
|
|
|
+ str,
|
|
|
+ "261",
|
|
|
+ "0",
|
|
|
+ "待通知",
|
|
|
+ notifyRole,
|
|
|
+ actTest.getProcessInstanceId(),new Date()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ workActivityProcessService.deleteProcessIdAuditUsers(actTest.getProcessInstanceId());
|
|
|
+ } else {
|
|
|
+ if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("actTest")) {
|
|
|
+ WorkProjectNotify notify = new WorkProjectNotify();
|
|
|
+ notify.setNotifyId(actTest.getId());
|
|
|
+ userList = workProjectNotifyService.readByNotifyId(notify);
|
|
|
+ WorkProjectNotify workProjectNotify = UtilNotify
|
|
|
+ .saveNewNotify(actTest.getId(),
|
|
|
+ new User(),
|
|
|
+ actTest.getCompanyId(),
|
|
|
+ title,
|
|
|
+ str,
|
|
|
+ "261",
|
|
|
+ "0",
|
|
|
+ "待审批",
|
|
|
+ notifyRole,
|
|
|
+ actTest.getProcessInstanceId(),new Date());
|
|
|
+ List<WorkProjectNotify> workProjectNotifys = activityService.getByFlagAndTaskDefKeyList(
|
|
|
+ activities,
|
|
|
+ workProjectNotify,
|
|
|
+ taskDefKey,
|
|
|
+ actTest.getAct().getFlag(),
|
|
|
+ taskCount,
|
|
|
+ actTest.getCreateBy(),
|
|
|
+ actTest.getOfficeId(),
|
|
|
+ "5");
|
|
|
+ for (WorkProjectNotify workProjectNotify1:workProjectNotifys){
|
|
|
+ users.add(workProjectNotify1.getUser());
|
|
|
+ workProjectNotify1.setId("");
|
|
|
+ workProjectNotify1.setIsNewRecord(false);
|
|
|
+ workProjectNotifyService
|
|
|
+ .save(workProjectNotify1);
|
|
|
+ if (!"modifyApply".equals(taskDefKey)){
|
|
|
+ Map<String,Object> extras = new HashMap<>();
|
|
|
+ if ("fpgly".equals(taskDefKey) ){
|
|
|
+ extras.put("type","7001");
|
|
|
+ }else {
|
|
|
+ extras.put("type","7002");
|
|
|
+ }
|
|
|
+ extras.put("id",workProjectNotify.getId());
|
|
|
+ extras.put("procDefKey","261");
|
|
|
+ UserUtils.pushInfoToApp(title,str,extras,workProjectNotify1.getUser().getId());
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ } else {
|
|
|
+ if (!"yes".equals(actTest.getAct().getFlag())) {//驳回待办提醒
|
|
|
+ title = "申请被驳回";
|
|
|
+ str = "申请被驳回，请选择重新申请或作废";
|
|
|
+ WorkProjectNotify notify = new WorkProjectNotify();
|
|
|
+ notify.setNotifyId(actTest.getId());
|
|
|
+ userList = workProjectNotifyService.readByNotifyId(notify);
|
|
|
+ workProjectNotifyService
|
|
|
+ .save(UtilNotify
|
|
|
+ .saveNewNotify(actTest.getId(),
|
|
|
+ actTest.getCreateBy(),
|
|
|
+ actTest.getCompanyId(),
|
|
|
+ title,
|
|
|
+ str,
|
|
|
+ "261",
|
|
|
+ "0",
|
|
|
+ "重新申请",
|
|
|
+ notifyRole,
|
|
|
+ actTest.getProcessInstanceId(),new Date()));
|
|
|
+ users.add( actTest.getCreateBy());
|
|
|
+ } else {
|
|
|
+ if (StringUtils.isNotBlank(enname)) {//驳回重新申请待办
|
|
|
+ title = "重新申请，待审批";
|
|
|
+ str = "重新申请，待审批";
|
|
|
+ WorkProjectNotify notify = new WorkProjectNotify();
|
|
|
+ notify.setNotifyId(actTest.getId());
|
|
|
+ userList = workProjectNotifyService.readByNotifyId(notify);
|
|
|
+ WorkProjectNotify workProjectNotify = UtilNotify
|
|
|
+ .saveNewNotify(actTest.getId(),
|
|
|
+ new User(),
|
|
|
+ actTest.getCompanyId(),
|
|
|
+ title,
|
|
|
+ str,
|
|
|
+ "261",
|
|
|
+ "0",
|
|
|
+ "待审批",
|
|
|
+ notifyRole,
|
|
|
+ actTest.getProcessInstanceId(),new Date());
|
|
|
+ for (User user1:auditUsers){
|
|
|
+ users.add(user1);
|
|
|
+ workProjectNotify.setUser(user1);
|
|
|
+ workProjectNotify.setId("");
|
|
|
+ workProjectNotify.setIsNewRecord(false);
|
|
|
+ workProjectNotifyService
|
|
|
+ .save(workProjectNotify);
|
|
|
+ if (!"modifyApply".equals(taskDefKey)){
|
|
|
+ Map<String,Object> extras = new HashMap<>();
|
|
|
+ if ("fpgly".equals(taskDefKey)){
|
|
|
+ extras.put("type","7001");
|
|
|
+ }else {
|
|
|
+ extras.put("type","7002");
|
|
|
+ }
|
|
|
+ extras.put("id",workProjectNotify.getId());
|
|
|
+ extras.put("procDefKey","261");
|
|
|
+ UserUtils.pushInfoToApp(title,str,extras,user1.getId());
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ WorkProjectNotify notify = new WorkProjectNotify();
|
|
|
+ notify.setNotifyId(actTest.getId());
|
|
|
+ userList = workProjectNotifyService.readByNotifyId(notify);
|
|
|
+ users.addAll(userList);
|
|
|
+ users.add(actTest.getCreateBy());
|
|
|
+ workProjectNotifyService
|
|
|
+ .save(UtilNotify
|
|
|
+ .saveNewNotify(actTest.getId(),
|
|
|
+ actTest.getCreateBy(),
|
|
|
+ actTest.getCompanyId(),
|
|
|
+ title,
|
|
|
+ str,
|
|
|
+ "261",
|
|
|
+ "0",
|
|
|
+ "重新申请",
|
|
|
+ notifyRole,
|
|
|
+ actTest.getProcessInstanceId(),new Date()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //对数据进行处理
|
|
|
+ if(null != nowWorkProjectNotify){
|
|
|
+ workProjectNotifyService.updateWpaData(nowWorkProjectNotify);
|
|
|
+ }
|
|
|
+ if (users!=null && users.size()!=0) {
|
|
|
+ for (User u : users) {
|
|
|
+ UserUtils.pushIm(u.getId(),str);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (userList!=null && userList.size()!=0) {
|
|
|
+ for (User u : userList) {
|
|
|
+ UserUtils.pushMeIm(u.getId());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ actTestDao.update(actTest);
|
|
|
+ return "保存审核意见成功！";
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 强制撤销
|
|
|
+ * @param actTest
|
|
|
+ */
|
|
|
+ @Transactional(readOnly = false)
|
|
|
+ public void cancelInvalidate(ActTest actTest) {
|
|
|
+ String invalidateProcessInstanceId = actTest.getProcessInstanceId();
|
|
|
+ try {
|
|
|
+ //将流程图中尚未走到的task的流程追踪信息逻辑删除，添加一条"撤销"流程追踪信息
|
|
|
+ WorkActivityProcess process = new WorkActivityProcess();
|
|
|
+ process.setProcessInstanceId(actTest.getProcessInstanceId());
|
|
|
+ process.setIsApproval("0");
|
|
|
+ WorkActivityProcess workActivityProcess = new WorkActivityProcess();
|
|
|
+ workActivityProcess.setProcessInstanceId(actTest.getProcessInstanceId());
|
|
|
+ List<WorkActivityProcess> processList = workActivityProcessService.findList(workActivityProcess);
|
|
|
+ WorkProjectNotify notify = new WorkProjectNotify();
|
|
|
+ notify.setNotifyId(actTest.getId());
|
|
|
+ workProjectNotifyService.readByNotifyId(notify);
|
|
|
+ if (processList != null && processList.size() > 0) {
|
|
|
+ for (int i = 0; i < processList.size(); i++) {
|
|
|
+ WorkActivityProcess p = processList.get(i);
|
|
|
+ if (StringUtils.isNotBlank(p.getIsApproval()) && "0".equals(p.getIsApproval())) {
|
|
|
+ p.setDelFlag("1");
|
|
|
+ p.setIsApproval("-1");
|
|
|
+ workActivityProcessDao.updateDelFlagAndIsApproval(p);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ WorkActivityProcess pro = new WorkActivityProcess();
|
|
|
+ pro.setId("");
|
|
|
+ pro.preInsert();
|
|
|
+ pro.setDelFlag("0");
|
|
|
+ pro.setRemarks("[强制撤销]");
|
|
|
+ pro.setProcessKey(processList.get(0).getProcessKey());
|
|
|
+ pro.setIsApproval("1");
|
|
|
+ pro.setProcessInstanceId(processList.get(0).getProcessInstanceId());
|
|
|
+ pro.setCount(0);
|
|
|
+ workActivityProcessDao.insert(pro);
|
|
|
+ }
|
|
|
+ //结束该流程,设为"撤销"状态
|
|
|
+ actTaskService.endProcessInstance(invalidateProcessInstanceId, "流程测试申请-撤销");
|
|
|
+ actTest.setStatus("3");
|
|
|
+ actTest.preUpdate();
|
|
|
+ actTestDao.update(actTest);
|
|
|
+ } catch (ActivitiObjectNotFoundException e) {
|
|
|
+ System.err.println("撤销发票申请异常，因为这个流程已不存在!");
|
|
|
+ e.printStackTrace();
|
|
|
+ logger.error("Exception e:"+e);
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ logger.error("Exception e:"+e);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ @Transactional(readOnly = false)
|
|
|
+ public void delete(ActTest actTest) {
|
|
|
+ dao.get(actTest);
|
|
|
+ dao.deleteByLogic(actTest);
|
|
|
+ //删除流程表信息
|
|
|
+ workProjectNotifyService.deleteActivityProcess(actTest.getProcessInstanceId());
|
|
|
+ //删除流程人员表信息
|
|
|
+ workProjectNotifyService.deleteActivityProcessUser(actTest.getProcessInstanceId());
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+}
|
sangwenwei