施工修改

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

@@ -1304,7 +1304,7 @@ public class ActTaskService extends BaseService {
 		} else {
 			ProcessPersonnel loginName = processPersonnelService.findLoginName(act.getProcInsId());
 			design = loginName.getTheDesigner();
-			vars.put("design",design);
+			vars.put("design","项目");
 		}
 		//根据登陆查询所属的角色
 		vars.put("pass", "yes".equals(flag)? true : false);
@@ -1471,7 +1471,7 @@ public class ActTaskService extends BaseService {
 			act.setComment("[设计变更]"+act.getComment());
 		} else if ("pass2".equals(flag)) {
 			vars.put("pass2", true);
-			vars.put("itemClose", "配网系统专职");
+			vars.put("itemClose", "专职");
 			act.setComment("[项目关闭]"+act.getComment());
 		} else if ("reject".equals(flag)) {
 			vars.put("reject", true);
@@ -2115,7 +2115,7 @@ public class ActTaskService extends BaseService {
 		if (null!=disclose.getAdministrationType()){
 			if (disclose.getAdministrationType().contains("民事政处")||disclose.getAdministrationType().contains("农村政处")){
 				flag = "民事农村";
-			} else if (disclose.getAdministrationType().contains("行政政处(城区道路)")) {
+			} else if (disclose.getAdministrationType().indexOf("城区道路")>=0) {
 				flag = "行政";
 			}
 		}

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -757,11 +757,18 @@ public class ActTaskController extends BaseController {
 				}
 			}
 			if (flagDesign){
-				if (null==disclose.getInconsistentDescription()||disclose.getExplanationOfNecessity().equals("")){
+				if (null==disclose.getInconsistentDescription()||disclose.getInconsistentDescription().equals("")){
 					s+="图纸现场不一致说明不能为空!";
 					flag = true;
 				}
 			}
+			if ("民事农村".equals(flagDeal)||"行政".equals(flagDeal)) {
+				String policyHandlingInstructions = disclose.getPolicyHandlingInstructions();
+				if (policyHandlingInstructions == null || "".equals(policyHandlingInstructions)) {
+					s += "政策处理说明不能为空";
+					flag = true;
+				}
+			}
 /*			if (flagDeal){
 				if (null==disclose.getPolicyHandlingInstructions()||disclose.getPolicyHandlingInstructions().equals("")){
 					s+=" 政策处理说明不能为空!";

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/ProjectMapper.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.sg.managementcenter.project.mapper;
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -22,7 +23,7 @@ public interface ProjectMapper extends BaseMapper<Project> {
     /**
      * 根据项目需求名称修改项目施工交底状态0未发起施工交底，1施工交底过程中，2完成施工交底
      * */
-    void updateStatusBy(String status,String procInsId);
+    void updateStatusBy(@Param("status") String status,@Param("procInsId") String procInsId);
 
     public List<Project> findListById(String[] proListId);
 }

src/main/webapp/webpage/modules/sg/managementcenter/activiti/economicsDesignChange.jsp

@@ -289,7 +289,6 @@
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
 								<td class="width-35">
-										${construction.disclose.politicalProblem}
 								</td>
 							</tr>
 							<tr>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/operatorDesignChange.jsp

@@ -310,7 +310,6 @@
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
 								<td class="width-35">
-										${construction.disclose.politicalProblem}
 								</td>
 							</tr>
 							<tr>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/policiesChange.jsp

@@ -306,7 +306,6 @@
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
 								<td class="width-35">
-										${construction.disclose.politicalProblem}
 								</td>
 							</tr>
 							<tr>