瀏覽代碼

工作流程

xs 5 年之前
父節點
當前提交
dbe6e28c00

+ 4 - 3
src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -1367,11 +1367,11 @@ public class ActTaskService extends BaseService {
         }else {
 			if (flagItemCLose){
 				vars.put("itemClose","专职");
-				vars.put("pass2",flagItemCLose);
+				vars.put("pass2",true);
 			}else {
 				if (flagDesign){
 					vars.put("design","运行人员");
-					vars.put("pass1", flagDesign);
+					vars.put("pass1", true);
 				}
 				if ("民事农村".equals(flagDeal)){
 					vars.put("policy","政策处理");
@@ -2031,7 +2031,7 @@ public class ActTaskService extends BaseService {
 		ValueExpression e = factory.createValueExpression(context, el, boolean.class);
 		return (Boolean) e.getValue(context);
 	}
-
+	//项目关闭
 	public Boolean isJudgeItemClose(Disclose disclose){
 		Boolean flag = false;
 		if (null!=disclose.getChannel()&&disclose.getChannel().equals("无")){//施工通道
@@ -2058,6 +2058,7 @@ public class ActTaskService extends BaseService {
 //		}
 		return flag;
 	}
+	//设计变更
 	public Boolean isJudgeDesign(Disclose disclose){
 		Boolean flag = false;
 		if (null!=disclose.getLineName()&&disclose.getLineName().equals("否")){

+ 2 - 2
src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -746,8 +746,8 @@ public class ActTaskController extends BaseController {
 			j.setMsg("请导入数据");
 			return j;
 		}
-		Boolean flagDesign = actTaskService.isJudgeDesign(disclose);
-		Boolean flagItemCLose =actTaskService.isJudgeItemClose(disclose);
+		Boolean flagDesign = actTaskService.isJudgeDesign(disclose);//设计变更
+		Boolean flagItemCLose =actTaskService.isJudgeItemClose(disclose);//项目关闭
 		String flagDeal =actTaskService.newJudgeDeal(disclose);
 		if (null==disclose.getPrecondition()||"".equals(disclose.getPrecondition())){
 			if (flagItemCLose){