1111

src/main/java/com/jeeplus/modules/workactivity/entity/WorkActivityProcess.java

@@ -18,7 +18,7 @@ public class WorkActivityProcess extends DataEntity<WorkActivityProcess> {
 	
 	private static final long serialVersionUID = 1L;
 	private String processKey;			// 流程标识
-	private String isApproval;			// 是否审批
+	private String isApproval;			// 是否审批，1 审批通过。2审批未通过
 	private String processInstanceId;		// 实例流程id
 	private int count;
 	private Activity activity;

src/main/java/com/jeeplus/modules/workactivity/service/WorkActivityProcessService.java

@@ -104,10 +104,10 @@ public class WorkActivityProcessService extends CrudService<WorkActivityProcessD
 		dao.deleteProcessInstanceById(processId);
 	}
 	@Transactional(readOnly = false)
-	public void updateProcess(WorkActivityProcess workActivityProcess, WorkActivityMenu workActivityMenu,int key, String taskCount, String processInstanceId, String taskDefKey,String audit, String flag, String comment, List<Activity> activities) {
-		if (workActivityProcess.getCount()!=0){
+	public void updateProcess(WorkActivityProcess workActivityProcess, WorkActivityMenu workActivityMenu, int key, String taskCount, String processInstanceId, String taskDefKey, String audit, String flag, String comment, List<Activity> activities) {
+		if (workActivityProcess.getCount() != 0) {
 			workActivityProcess.setId("");
-		}else {
+		} else {
 			WorkActivityProcess workActivityProcess1 = new WorkActivityProcess();
 			workActivityProcess1.setIsApproval("0");
 			workActivityProcess1.setCount(0);
@@ -118,11 +118,11 @@ public class WorkActivityProcessService extends CrudService<WorkActivityProcessD
 		workActivityProcess.setRemarks(comment);
 		workActivityProcess.setProcessInstanceId(processInstanceId);
 		workActivityProcess.setProcessKey(workActivityMenu.getProcessType());
-		if (workActivityProcess.getCount()!=0) {
+		if (workActivityProcess.getCount() != 0) {
 			workActivityProcess.setCount(Integer.parseInt(taskCount));
 		}
-		workActivityProcess.setIsApproval("yes".equals(flag)?"1":"2");
-		if (workActivityProcess!=null && StringUtils.isNotBlank(workActivityProcess.getIsApproval())){
+		workActivityProcess.setIsApproval("yes".equals(flag) ? "1" : "2");
+		if (workActivityProcess != null && StringUtils.isNotBlank(workActivityProcess.getIsApproval())) {
 
 			WorkActivityProcess w = new WorkActivityProcess();
 			w.setProcessInstanceId(processInstanceId);
@@ -130,8 +130,8 @@ public class WorkActivityProcessService extends CrudService<WorkActivityProcessD
 			w.setDelFlag("0");
 			this.delFlag(w);
 			WorkActivityProcess process = w;
-			if((taskDefKey.equals("modifyApply") && key==1) || (taskDefKey.equals(audit)&& key==0)) {
-				if ("yes".equals(flag)){
+			if ((taskDefKey.equals("modifyApply") && key == 1) || (taskDefKey.equals(audit) && key == 0)) {
+				if ("yes".equals(flag)) {
 					String returnBack = "";
 					for (Activity activity : activities) {
 						if (activity.getCount() == Integer.parseInt(taskCount)) {
@@ -142,20 +142,20 @@ public class WorkActivityProcessService extends CrudService<WorkActivityProcessD
 						if (returnBack.equals("1")) {
 							if (!taskCount.equals("1")) {
 								process.setCount(1);
-							}else {
+							} else {
 								process.setCount(1);
 							}
 						} else if (returnBack.equals("2")) {
 							process.setCount(1);
-						} else{
+						} else {
 							process.setCount(1);
 						}
 					}
 					workActivityProcess.setId("");
-				}else {
+				} else {
 					process.setCount(11);
 				}
-			}else {
+			} else {
 				if ("yes".equals(flag)) {
 					process.setCount(Integer.parseInt(taskCount) + 1);
 				} else {
@@ -169,12 +169,12 @@ public class WorkActivityProcessService extends CrudService<WorkActivityProcessD
 						if (returnBack.equals("1")) {
 							if (!taskCount.equals("1")) {
 								process.setCount(1);
-							}else {
+							} else {
 								process.setCount(1);
 							}
 						} else if (returnBack.equals("2")) {
 							process.setCount(1);
-						} else{
+						} else {
 							process.setCount(1);
 						}
 						WorkActivityProcess workActivityProcess1 = new WorkActivityProcess();
@@ -189,12 +189,13 @@ public class WorkActivityProcessService extends CrudService<WorkActivityProcessD
 			}
 			process.setDelFlag("1");
 			this.delFlag(process);
-			if (workActivityProcess.getCount()==0){
+			if (workActivityProcess.getCount() == 0) {
 				workActivityProcess.setDelFlag("0");
 			}
 			this.save(workActivityProcess);
 		}
 	}
+
 	@Transactional(readOnly = false)
 	public void updateProcessSpecial(WorkActivityProcess workActivityProcess, WorkActivityMenu workActivityMenu,int key, String taskCount, String processInstanceId, String taskDefKey,String audit, String flag, String comment, List<Activity> activities) {
 		if (workActivityProcess.getCount()!=0){