|
|
@@ -8,6 +8,7 @@ import com.jeeplus.common.utils.StringUtils;
|
|
|
import com.jeeplus.modules.act.entity.Act;
|
|
|
import com.jeeplus.modules.act.service.ActTaskService;
|
|
|
import com.jeeplus.modules.externalUnit.dao.ExternalUnitCapitalDemandDao;
|
|
|
+import com.jeeplus.modules.externalUnit.dao.ExternalUnitProjectRecordsDao;
|
|
|
import com.jeeplus.modules.externalUnit.entity.ExternalUnitCapitalDemand;
|
|
|
import com.jeeplus.modules.externalUnit.entity.ExternalUnitProjectRecords;
|
|
|
import com.jeeplus.modules.externalUnit.entity.ExternalUnitWorkClientAttachment;
|
|
|
@@ -84,6 +85,9 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
@Autowired
|
|
|
private WorkActivityProcessDao workActivityProcessDao;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ExternalUnitProjectRecordsDao unitProjectRecordsDao;
|
|
|
+
|
|
|
|
|
|
|
|
|
public ExternalUnitCapitalDemand get(String id) {
|
|
|
@@ -142,16 +146,23 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
);
|
|
|
long s6=System.currentTimeMillis();
|
|
|
List<User> users = new ArrayList<>();
|
|
|
+ List<User> jfsh = new ArrayList<>();
|
|
|
List<User> wjbc = new ArrayList<>();
|
|
|
+ List<User> jffh = new ArrayList<>();
|
|
|
if (StringUtils.isNotBlank(capitalDemand.getId())){
|
|
|
//通知添加流程实例ID
|
|
|
WorkProjectNotify notify = new WorkProjectNotify();
|
|
|
notify.setNotifyId(capitalDemand.getId());
|
|
|
workProjectNotifyService.readByNotifyId(notify);
|
|
|
}
|
|
|
- //文件补充审核
|
|
|
+ //甲方审核
|
|
|
+ List<User> members = unitProjectRecordsDao.findJf(capitalDemand.getProject().getId(), "");
|
|
|
+ jfsh.addAll(members);
|
|
|
+ //文件补充
|
|
|
User user1 = UserUtils.get(capitalDemand.getExaminer());
|
|
|
wjbc.add(user1);
|
|
|
+ //甲方复核
|
|
|
+ jffh.addAll(members);
|
|
|
long s7=System.currentTimeMillis();
|
|
|
if (StringUtils.isNotBlank(workActivityMenu.getId())) {
|
|
|
workProjectNotify.setNotifyRole("");
|
|
|
@@ -187,21 +198,22 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
}
|
|
|
workProjectNotify.setId("");
|
|
|
} else {
|
|
|
- if (wjbc.size()==0 ){
|
|
|
+ if (jfsh.size()==0 ){
|
|
|
capitalDemand.setStatus("1");//暂存
|
|
|
this.save(capitalDemand);
|
|
|
}
|
|
|
- if (wjbc.size()==0){
|
|
|
+ if (jfsh.size()==0){
|
|
|
return "流程审批人不能为空,请联系管理员！";
|
|
|
}
|
|
|
- variables.put("wjbcCount",wjbc.size());
|
|
|
- variables.put("wjbcList",wjbc);
|
|
|
+ variables.put("jfshCount",jfsh.size());
|
|
|
+ variables.put("jfshList",jfsh);
|
|
|
processType = "capitalDemand";
|
|
|
- users.addAll(wjbc);
|
|
|
+ users.addAll(jfsh);
|
|
|
}
|
|
|
for (User user : users){
|
|
|
workProjectNotify.setUser(user);
|
|
|
workProjectNotify.setId("");
|
|
|
+ workProjectNotify.setNotifyRole("甲方审核");
|
|
|
workProjectNotifyService
|
|
|
.save(workProjectNotify);
|
|
|
Map<String,Object> extras = new HashMap<>();
|
|
|
@@ -242,11 +254,15 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
workActivityProcess.setProcessInstanceId(processInstance.getId());
|
|
|
workActivityProcess.setIsApproval("0");
|
|
|
workActivityProcessService.save(workActivityProcess);
|
|
|
- /*workActivityProcess.setCount(2);
|
|
|
+ workActivityProcess.setCount(2);
|
|
|
workActivityProcess.setId("");
|
|
|
- workActivityProcessService.save(workActivityProcess);*/
|
|
|
- workActivityProcessService.insertAuditsByType(wjbc,processInstance.getId(),1,1);
|
|
|
- //workActivityProcessService.insertAuditsByType(fpglys,processInstance.getId(),2,0);
|
|
|
+ workActivityProcessService.save(workActivityProcess);
|
|
|
+ workActivityProcess.setCount(3);
|
|
|
+ workActivityProcess.setId("");
|
|
|
+ workActivityProcessService.save(workActivityProcess);
|
|
|
+ workActivityProcessService.insertAuditsByType(jfsh,processInstance.getId(),1,1);
|
|
|
+ workActivityProcessService.insertAuditsByType(wjbc,processInstance.getId(),2,1);
|
|
|
+ workActivityProcessService.insertAuditsByType(jffh,processInstance.getId(),3,1);
|
|
|
}
|
|
|
return "";
|
|
|
|
|
|
@@ -259,7 +275,7 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
* @return
|
|
|
*/
|
|
|
@Transactional(readOnly = false)
|
|
|
- public String auditSaveBranch(ExternalUnitCapitalDemand capitalDemand, List<User> auditUsers) {
|
|
|
+ public String auditSaveBranch(ExternalUnitCapitalDemand capitalDemand, List<User> auditUsers) throws Exception {
|
|
|
|
|
|
String userName = UserUtils.get(capitalDemand.getCreateBy().getId()).getName();
|
|
|
Office office = officeService.get(capitalDemand.getOfficeId());
|
|
|
@@ -354,24 +370,59 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
workActivityProcess.setId("");
|
|
|
}
|
|
|
// 审核环节
|
|
|
- if ("wjbc".equals(taskDefKey) && count.contains("1")) {
|
|
|
+ if ("jfsh".equals(taskDefKey) && count.contains("1")) {
|
|
|
taskCount = "1";
|
|
|
exp = "pass";
|
|
|
if ("yes".equals(capitalDemand.getAct().getFlag())) {
|
|
|
//审核通过处理
|
|
|
- notifyRole = "项目-"+capitalDemand.getProject().getName()+"提资需求审核完成";
|
|
|
+ workActivityProcessService.insertAuditsByType(auditUsers,capitalDemand.getProcessInstanceId(),2,1);
|
|
|
+ notifyRole = "文件补充";
|
|
|
+ workActivityProcess.setIsApproval("1");
|
|
|
+ enname = "wjbc";
|
|
|
+ vars.put("wjbcList", auditUsers);
|
|
|
+ vars.put("wjbcCount",auditUsers.size());
|
|
|
+
|
|
|
+ }
|
|
|
+// else {
|
|
|
+// notifyRole = "项目-"+capitalDemand.getProject().getName()+"提资需求调整申请";
|
|
|
+// workActivityProcess.setIsApproval("2");
|
|
|
+// }
|
|
|
+ break;
|
|
|
+ } else if ("wjbc".equals(taskDefKey) && count.contains("2")) {
|
|
|
+ taskCount = "2";
|
|
|
+ exp = "pass";
|
|
|
+ if ("yes".equals(capitalDemand.getAct().getFlag())) {
|
|
|
+ //审核通过处理
|
|
|
+ workActivityProcessService.insertAuditsByType(auditUsers,capitalDemand.getProcessInstanceId(),3,1);
|
|
|
+ notifyRole = "甲方复核";
|
|
|
workActivityProcess.setIsApproval("1");
|
|
|
+ enname = "jffh";
|
|
|
+ vars.put("jffhList", auditUsers);
|
|
|
+ vars.put("jffhCount",auditUsers.size());
|
|
|
} else {
|
|
|
notifyRole = "项目-"+capitalDemand.getProject().getName()+"提资需求调整申请";
|
|
|
workActivityProcess.setIsApproval("2");
|
|
|
}
|
|
|
break;
|
|
|
+ } else if ("jffh".equals(taskDefKey) && count.contains("3")) {
|
|
|
+ taskCount = "3";
|
|
|
+ exp = "pass";
|
|
|
+ if ("yes".equals(capitalDemand.getAct().getFlag())) {
|
|
|
+ //审核通过处理
|
|
|
+ notifyRole = "项目-"+capitalDemand.getProject().getName()+"提资需求审核完成";
|
|
|
+ workActivityProcess.setIsApproval("1");
|
|
|
+ }
|
|
|
+// else {
|
|
|
+// notifyRole = "项目-"+capitalDemand.getProject().getName()+"提资需求调整申请";
|
|
|
+// workActivityProcess.setIsApproval("2");
|
|
|
+// }
|
|
|
+ break;
|
|
|
} else if ("modifyApply".equals(taskDefKey)&& count.contains("0")) {
|
|
|
- notifyRole = "文件补充审批";
|
|
|
+ notifyRole = "甲方审批";
|
|
|
taskCount = "0";
|
|
|
exp = "pass";
|
|
|
workActivityProcess.setCount(0);
|
|
|
- enname ="wjbc";
|
|
|
+ enname ="jfsh";
|
|
|
if (!"yes".equals(capitalDemand.getAct().getFlag())) {
|
|
|
capitalDemand.setStatus("3");
|
|
|
}
|
|
|
@@ -421,6 +472,8 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
capitalDemand.getProcessInstanceId(),new Date()));
|
|
|
|
|
|
} else {
|
|
|
+ str = "项目-"+capitalDemand.getProject().getName()+"提资需求被驳回" ;
|
|
|
+ title = "项目-"+capitalDemand.getProject().getName()+"提资需求被驳回";
|
|
|
WorkProjectNotify notify = new WorkProjectNotify();
|
|
|
notify.setNotifyId(capitalDemand.getId());
|
|
|
userList = workProjectNotifyService.readByNotifyId(notify);
|
|
|
@@ -441,6 +494,7 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
}
|
|
|
}
|
|
|
workActivityProcessService.deleteProcessIdAuditUsers(capitalDemand.getProcessInstanceId());
|
|
|
+ endInvalidate(capitalDemand);
|
|
|
}else{
|
|
|
if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("capitalDemand")) {
|
|
|
WorkProjectNotify notify = new WorkProjectNotify();
|
|
|
@@ -474,7 +528,7 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
.save(workProjectNotify1);
|
|
|
if (!"modifyApply".equals(taskDefKey)){
|
|
|
Map<String,Object> extras = new HashMap<>();
|
|
|
- if ("wjbc".equals(taskDefKey) ){
|
|
|
+ if ("wjbc".equals(taskDefKey) || "jffh".equals(taskDefKey)){
|
|
|
extras.put("type","7001");
|
|
|
}else {
|
|
|
extras.put("type","7002");
|
|
|
@@ -508,8 +562,8 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
users.add( capitalDemand.getCreateBy());
|
|
|
} else {
|
|
|
if (StringUtils.isNotBlank(enname)) {//驳回重新申请待办
|
|
|
- title = "项目-"+capitalDemand.getProject().getName()+"提资需求重新申请，待审批";
|
|
|
- str = "项目-"+capitalDemand.getProject().getName()+"提资需求重新申请，待审批";
|
|
|
+ title = "项目-"+capitalDemand.getProject().getName()+"提资需求待审批";
|
|
|
+ str = "项目-"+capitalDemand.getProject().getName()+"提资需求待审批";
|
|
|
WorkProjectNotify notify = new WorkProjectNotify();
|
|
|
notify.setNotifyId(capitalDemand.getId());
|
|
|
userList = workProjectNotifyService.readByNotifyId(notify);
|
|
|
@@ -533,7 +587,7 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
.save(workProjectNotify);
|
|
|
if (!"modifyApply".equals(taskDefKey)){
|
|
|
Map<String,Object> extras = new HashMap<>();
|
|
|
- if ("wjbc".equals(taskDefKey)){
|
|
|
+ if ("jfsh".equals(taskDefKey)){
|
|
|
extras.put("type","7001");
|
|
|
}else {
|
|
|
extras.put("type","7002");
|
|
|
@@ -668,6 +722,64 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
+ * 驳回流程终止
|
|
|
+ */
|
|
|
+ @Transactional(readOnly = false)
|
|
|
+ public void endInvalidate(ExternalUnitCapitalDemand capitalDemand) {
|
|
|
+ try {
|
|
|
+ String invalidateProcessInstanceId = capitalDemand.getProcessInstanceId();
|
|
|
+ //将流程图中尚未走到的task的流程追踪信息逻辑删除，添加一条"终止"流程追踪信息
|
|
|
+ WorkActivityProcess process = new WorkActivityProcess();
|
|
|
+ process.setProcessInstanceId(capitalDemand.getProcessInstanceId());
|
|
|
+ process.setIsApproval("0");
|
|
|
+ WorkActivityProcess workActivityProcess = new WorkActivityProcess();
|
|
|
+ workActivityProcess.setProcessInstanceId(capitalDemand.getProcessInstanceId());
|
|
|
+ List<WorkActivityProcess> processList = workActivityProcessService.findList(workActivityProcess);
|
|
|
+ WorkProjectNotify notify = new WorkProjectNotify();
|
|
|
+ notify.setNotifyId(capitalDemand.getId());
|
|
|
+ List<User> userList = workProjectNotifyService.readByNotifyId(notify);
|
|
|
+ if (userList!=null && userList.size()!=0) {
|
|
|
+ for (User u : userList) {
|
|
|
+ User user = UserUtils.get(u.getId());
|
|
|
+ UserUtils.pushMeIm(user.getId());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(processList!=null && processList.size()>0){
|
|
|
+ for (int i =0;i<processList.size();i++) {
|
|
|
+ WorkActivityProcess p = processList.get(i);
|
|
|
+ if(com.jeeplus.common.utils.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,"提资需求申请-流程终止");
|
|
|
+
|
|
|
+ }catch (ActivitiObjectNotFoundException e){
|
|
|
+ System.err.println("提资需求驳回异常，因为这个流程已不存在!");
|
|
|
+ e.printStackTrace();
|
|
|
+ logger.error("Exception e:"+e);
|
|
|
+ }
|
|
|
+ catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ logger.error("Exception e:"+e);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
* 删除操作
|
|
|
* @param capitalDemand
|
|
|
* @return
|
|
|
@@ -775,8 +887,8 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
workActivityProcess.setId("");
|
|
|
}
|
|
|
// 审核环节
|
|
|
- if ("wjbc".equals(taskDefKey) && count.contains("1")) {
|
|
|
- taskCount = "1";
|
|
|
+ if ("wjbc".equals(taskDefKey) && count.contains("2")) {
|
|
|
+ taskCount = "2";
|
|
|
exp = "pass";
|
|
|
if ("yes".equals(capitalDemand.getAct().getFlag())) {
|
|
|
//审核通过处理
|
|
|
@@ -786,11 +898,11 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
}
|
|
|
break;
|
|
|
} else if ("modifyApply".equals(taskDefKey)&& count.contains("0")) {
|
|
|
- notifyRole = "文件补充审批";
|
|
|
+ notifyRole = "甲方审批";
|
|
|
taskCount = "0";
|
|
|
exp = "pass";
|
|
|
workActivityProcess.setCount(0);
|
|
|
- enname ="wjbc";
|
|
|
+ enname ="jfsh";
|
|
|
if (!"yes".equals(capitalDemand.getAct().getFlag())) {
|
|
|
capitalDemand.setStatus("3");
|
|
|
}
|
|
|
@@ -849,7 +961,7 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
WorkActivityProcess workActivityProcess1 = new WorkActivityProcess();
|
|
|
workActivityProcess1.setId(IdGen.uuid());
|
|
|
workActivityProcess1.setProcessKey("capitalDemand");
|
|
|
- workActivityProcess1.setCount(1);
|
|
|
+ workActivityProcess1.setCount(2);
|
|
|
workActivityProcess1.setProcessInstanceId(capitalDemand.getProcessInstanceId());
|
|
|
workActivityProcess1.setIsApproval("0");
|
|
|
workActivityProcess1.setCreateBy(createUser);
|
|
|
@@ -909,7 +1021,7 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
|
|
|
dao.update(capitalDemand);
|
|
|
//上传附件
|
|
|
- if (CollectionUtils.isNotEmpty(capitalDemand.getWorkAttachments())){
|
|
|
+ if (CollectionUtils.isNotEmpty(capitalDemand.getWorkAttachments())){
|
|
|
for (ExternalUnitWorkClientAttachment workClientAttachment : capitalDemand.getWorkAttachments()){
|
|
|
if (workClientAttachment.getId() == null){
|
|
|
continue;
|
|
|
@@ -1033,24 +1145,59 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
workActivityProcess.setId("");
|
|
|
}
|
|
|
// 审核环节
|
|
|
- if ("wjbc".equals(taskDefKey) && count.contains("1")) {
|
|
|
+ if ("jfsh".equals(taskDefKey) && count.contains("1")) {
|
|
|
taskCount = "1";
|
|
|
exp = "pass";
|
|
|
if ("yes".equals(capitalDemand.getAct().getFlag())) {
|
|
|
//审核通过处理
|
|
|
- notifyRole = "项目-"+capitalDemand.getProject().getName()+"提资需求审核完成";
|
|
|
+ workActivityProcessService.insertAuditsByType(auditUsers,capitalDemand.getProcessInstanceId(),2,1);
|
|
|
+ notifyRole = "文件补充";
|
|
|
+ workActivityProcess.setIsApproval("1");
|
|
|
+ enname = "wjbc";
|
|
|
+ vars.put("wjbcList", auditUsers);
|
|
|
+ vars.put("wjbcCount",auditUsers.size());
|
|
|
+
|
|
|
+ }
|
|
|
+// else {
|
|
|
+// notifyRole = "项目-"+capitalDemand.getProject().getName()+"提资需求调整申请";
|
|
|
+// workActivityProcess.setIsApproval("2");
|
|
|
+// }
|
|
|
+ break;
|
|
|
+ } else if ("wjbc".equals(taskDefKey) && count.contains("2")) {
|
|
|
+ taskCount = "2";
|
|
|
+ exp = "pass";
|
|
|
+ if ("yes".equals(capitalDemand.getAct().getFlag())) {
|
|
|
+ //审核通过处理
|
|
|
+ workActivityProcessService.insertAuditsByType(auditUsers,capitalDemand.getProcessInstanceId(),3,1);
|
|
|
+ notifyRole = "甲方复核";
|
|
|
workActivityProcess.setIsApproval("1");
|
|
|
+ enname = "jffh";
|
|
|
+ vars.put("jffhList", auditUsers);
|
|
|
+ vars.put("jffhCount",auditUsers.size());
|
|
|
} else {
|
|
|
notifyRole = "项目-"+capitalDemand.getProject().getName()+"提资需求调整申请";
|
|
|
workActivityProcess.setIsApproval("2");
|
|
|
}
|
|
|
break;
|
|
|
+ } else if ("jffh".equals(taskDefKey) && count.contains("3")) {
|
|
|
+ taskCount = "3";
|
|
|
+ exp = "pass";
|
|
|
+ if ("yes".equals(capitalDemand.getAct().getFlag())) {
|
|
|
+ //审核通过处理
|
|
|
+ notifyRole = "项目-"+capitalDemand.getProject().getName()+"提资需求审核完成";
|
|
|
+ workActivityProcess.setIsApproval("1");
|
|
|
+ }
|
|
|
+// else {
|
|
|
+// notifyRole = "项目-"+capitalDemand.getProject().getName()+"提资需求调整申请";
|
|
|
+// workActivityProcess.setIsApproval("2");
|
|
|
+// }
|
|
|
+ break;
|
|
|
} else if ("modifyApply".equals(taskDefKey)&& count.contains("0")) {
|
|
|
- notifyRole = "文件补充审批";
|
|
|
+ notifyRole = "甲方审批";
|
|
|
taskCount = "0";
|
|
|
exp = "pass";
|
|
|
workActivityProcess.setCount(0);
|
|
|
- enname ="wjbc";
|
|
|
+ enname ="jfsh";
|
|
|
if (!"yes".equals(capitalDemand.getAct().getFlag())) {
|
|
|
capitalDemand.setStatus("3");
|
|
|
}
|
|
|
@@ -1061,6 +1208,8 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
}
|
|
|
}
|
|
|
Boolean state = null;
|
|
|
+ //审核
|
|
|
+ taskService.resolveTask(capitalDemand.getAct().getTaskId());
|
|
|
|
|
|
WorkProjectNotify nowWorkProjectNotify = workProjectNotifyService.processingInfo(capitalDemand.getProcessInstanceId());
|
|
|
// 设置意见
|
|
|
@@ -1072,12 +1221,14 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
workActivityProcessService.updateProcess(workActivityProcess,workActivityMenu,key,taskCount,capitalDemand.getProcessInstanceId(),taskDefKey,"modifyApply",capitalDemand.getAct().getFlag(),comment, activities);
|
|
|
List<User> users = new ArrayList<>();
|
|
|
List<User> userList = new ArrayList<>();
|
|
|
- //审核
|
|
|
- taskService.resolveTask(capitalDemand.getAct().getTaskId());
|
|
|
+
|
|
|
+
|
|
|
+ actTaskService.complete(capitalDemand.getAct().getTaskId(), capitalDemand.getAct().getProcInsId(), capitalDemand.getAct().getComment(), vars);
|
|
|
+
|
|
|
|
|
|
state = actTaskService.isProcessEnd(capitalDemand.getAct().getProcInsId());
|
|
|
|
|
|
- if ("yes".equals(capitalDemand.getAct().getFlag())) {
|
|
|
+ if (!state) {
|
|
|
str = "项目-"+capitalDemand.getProject().getName()+"提资需求申请成功" ;
|
|
|
title = "项目-"+capitalDemand.getProject().getName()+"提资需求申请成功";
|
|
|
users.add(capitalDemand.getCreateBy());
|
|
|
@@ -1100,6 +1251,8 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
capitalDemand.getProcessInstanceId(),new Date()));
|
|
|
|
|
|
} else {
|
|
|
+ str = "项目-"+capitalDemand.getProject().getName()+"提资需求被驳回" ;
|
|
|
+ title = "项目-"+capitalDemand.getProject().getName()+"提资需求被驳回";
|
|
|
WorkProjectNotify notify = new WorkProjectNotify();
|
|
|
notify.setNotifyId(capitalDemand.getId());
|
|
|
userList = workProjectNotifyService.readByNotifyId(notify);
|
|
|
@@ -1120,6 +1273,7 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
}
|
|
|
}
|
|
|
workActivityProcessService.deleteProcessIdAuditUsers(capitalDemand.getProcessInstanceId());
|
|
|
+ endInvalidate(capitalDemand);
|
|
|
}else{
|
|
|
if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("capitalDemand")) {
|
|
|
WorkProjectNotify notify = new WorkProjectNotify();
|
|
|
@@ -1153,7 +1307,7 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
.save(workProjectNotify1);
|
|
|
if (!"modifyApply".equals(taskDefKey)){
|
|
|
Map<String,Object> extras = new HashMap<>();
|
|
|
- if ("wjbc".equals(taskDefKey) ){
|
|
|
+ if ("wjbc".equals(taskDefKey) || "jffh".equals(taskDefKey)){
|
|
|
extras.put("type","7001");
|
|
|
}else {
|
|
|
extras.put("type","7002");
|
|
|
@@ -1187,8 +1341,8 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
users.add( capitalDemand.getCreateBy());
|
|
|
} else {
|
|
|
if (StringUtils.isNotBlank(enname)) {//驳回重新申请待办
|
|
|
- title = "项目-"+capitalDemand.getProject().getName()+"提资需求重新申请，待审批";
|
|
|
- str = "项目-"+capitalDemand.getProject().getName()+"提资需求重新申请，待审批";
|
|
|
+ title = "项目-"+capitalDemand.getProject().getName()+"提资需求待审批";
|
|
|
+ str = "项目-"+capitalDemand.getProject().getName()+"提资需求待审批";
|
|
|
WorkProjectNotify notify = new WorkProjectNotify();
|
|
|
notify.setNotifyId(capitalDemand.getId());
|
|
|
userList = workProjectNotifyService.readByNotifyId(notify);
|
|
|
@@ -1212,7 +1366,7 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
|
|
|
.save(workProjectNotify);
|
|
|
if (!"modifyApply".equals(taskDefKey)){
|
|
|
Map<String,Object> extras = new HashMap<>();
|
|
|
- if ("wjbc".equals(taskDefKey)){
|
|
|
+ if ("jfsh".equals(taskDefKey)){
|
|
|
extras.put("type","7001");
|
|
|
}else {
|
|
|
extras.put("type","7002");
|
sangwenwei