Merge remote-tracking branch 'origin/master'

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

@@ -478,9 +478,10 @@ public class ActTaskController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "artificialTask")
-    public AjaxJson artificialTask(Act act) {
+    public AjaxJson artificialTask(Act act, Construction construction) {
         AjaxJson j = new AjaxJson();
         try {
+            constructionService.updateOIPI(construction);
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
             actTaskService.artificialTask(act);

src/main/java/com/jeeplus/modules/sg/audit/information/utils/ImportInformation.java

@@ -86,12 +86,12 @@ public  class ImportInformation {
                     isBack = "否";
                     isBackNo = 1;
                 }
-                if (materials.size() >= 1000 && flag == 1) {
+                if (materials.size() >= 5000 && flag == 1) {
                     //更新物料信息
                     materialService.saveMater(materials);
                     //根据插入的物料信息查询项目定义号，sum（判断是否完成领退料(0完成-1为完成)） 并按照项目定义号分组
                     List<Material> information = materialService.findInformation(materials);
-                    materials.clear();
+                    materials = new ArrayList<>();
                     //循环查询出的信息
                     for (Material maInfor : information) {
                         Information upInfor = new Information();
@@ -422,9 +422,9 @@ public  class ImportInformation {
                     informationList.add(information);
                     successNum++;
              }
-                if (informationList.size() == 1000) {
+                if (informationList.size() == 5000) {
                     informationService.saveInfo(informationList);
-                    informationList.clear();
+                    informationList = new ArrayList<>();
                 }
             } catch (Exception ex) {
                 ex.getMessage();
@@ -532,7 +532,7 @@ public  class ImportInformation {
                         }
                         materialService.updateNeed(upInfor);
                     }
-                    materialList.clear();
+                    materialList = new ArrayList<>();
                 }
                 if (noChange.size() == 1000) {
                     materialService.updateStatus(noChange);
@@ -553,7 +553,7 @@ public  class ImportInformation {
                         }
                         materialService.updateNeed(upInfor);
                     }
-                    noChange.clear();
+                    noChange = new ArrayList<>();
                 }
             } catch (Exception e) {
                 failureNum++;
@@ -578,11 +578,11 @@ public  class ImportInformation {
                     //根据项目定义号，更新项目是否完成领退料的状态
                     materialService.updateNeed(upInfor);
                 }
-                materialList.clear();
+                materialList = new ArrayList<>();
             }
             if (noChange.size() != 0) {
                 materialService.updateStatus(noChange);
-                noChange.clear();
+                noChange = new ArrayList<>();
             }
         } catch (Exception e) {
             failureNum++;
@@ -619,7 +619,7 @@ public  class ImportInformation {
                 if (appendList.size() == 1000) {
                     informationService.updateAppend(appendList);
                     successNum = successNum + appendList.size();
-                    appendList.clear();
+                    appendList = new ArrayList<>();
                 }
             } catch (Exception e) {
                 failureNum++;

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/entity/Construction.java

@@ -4,6 +4,7 @@ import com.jeeplus.core.persistence.ActEntity;
 import com.jeeplus.modules.sys.entity.User;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 施工交底Entity
@@ -66,6 +67,8 @@ public class Construction extends ActEntity<Construction> {
     private String rodNumber;
     //政处类型
     private String administrationType;
+    //政策处理类型回显问题
+    private List<String> administrationTypeList;
     //是否存在严重政处问题（预判）
     private String politicalProblem;
     //前置条件
@@ -423,6 +426,14 @@ public class Construction extends ActEntity<Construction> {
         this.administrationType = administrationType;
     }
 
+    public List<String> getAdministrationTypeList() {
+        return administrationTypeList;
+    }
+
+    public void setAdministrationTypeList(List<String> administrationTypeList) {
+        this.administrationTypeList = administrationTypeList;
+    }
+
     public String getPoliticalProblem() {
         return politicalProblem;
     }

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/ConstructionMapper.java

@@ -7,6 +7,7 @@ import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.test.activiti.entity.OALeave;
 import org.apache.ibatis.annotations.Param;
@@ -58,4 +59,8 @@ public interface ConstructionMapper extends BaseMapper<Construction> {
 
     List<Construction> findDisclosePage(Construction construction);
 
+    //根据用户名查询角色
+    List<Role> roleListByName(String name);
+
+    void updateOIPI(Construction construction);
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/xml/ConstructionMapper.xml

@@ -84,7 +84,7 @@
 		b.status As "status",
 		<include refid="disclose"/>
 		FROM xm_construction_clarificaiton a
-		LEFT JOIN xm_project_details b on a.project_id=b.id
+		LEFT JOIN xm_project_details b on a.project_id=b.project_id
 		LEFT JOIN xm_disclose_conclusion d on a.proc_ins_id = d.proc_ins_id
 		WHERE a.id = #{id}
     </select>
@@ -405,4 +405,22 @@
 			</if>
 		</where>
 	</select>
+
+	<select id="roleListByName" resultType="com.jeeplus.modules.sys.entity.Role">
+		select * from sys_role
+		where id in
+		(select role_id from sys_user_role
+			where user_id =(
+				select id from sys_user where name = #{name}
+			)
+		)
+	</select>
+	<update id="updateOIPI">
+		update xm_disclose_conclusion set
+		otherProblem = #{disclose.otherProblem},
+		inconsistentDescription = #{disclose.inconsistentDescription},
+		policyHandlingInstructions= #{disclose.policyHandlingInstructions},
+		implementedContent = #{disclose.implementedContent}
+		where proc_ins_id = #{procInsId};
+	</update>
 </mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/service/ConstructionService.java

@@ -137,4 +137,12 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 		construction.preInsert();
 		constructionMapper.insertDisclose(construction);
 	}
+
+	/**
+	 * 项目经理更新
+	 */
+	@Transactional(readOnly = false)
+	public void updateOIPI(Construction construction) {
+		constructionMapper.updateOIPI(construction);
+	}
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/utils/MyActiviUtils.java

@@ -6,6 +6,7 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.modules.sg.audit.information.service.InformationService;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.FindTask;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.MyNeedList;
+import com.jeeplus.modules.sg.managementcenter.activiti.mapper.ConstructionMapper;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
@@ -13,6 +14,7 @@ import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
 import com.jeeplus.modules.sg.picking.activiti.service.ShowListService;
 import com.jeeplus.modules.sys.entity.DictType;
 import com.jeeplus.modules.sys.entity.DictValue;
+import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.service.DictTypeService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import freemarker.template.Configuration;
@@ -57,6 +59,10 @@ public class MyActiviUtils {
     private static DictTypeService dictTypeService = SpringContextHolder.getBean(DictTypeService.class);
     @Autowired
     private static ShowListService showListService = SpringContextHolder.getBean(ShowListService.class);
+    @Autowired
+    private static ConstructionMapper constructionMapper = SpringContextHolder.getBean(ConstructionMapper.class);
+
+
     /**
      * 获取下一个用户任务信息
      * @param  taskId     任务Id信息
@@ -395,5 +401,13 @@ public class MyActiviUtils {
         }
         return str;
     }
+
+    /**
+     * 根据姓名查询角色列表
+     * */
+    public static List<Role> RoleListByName(String name) {
+        List<Role> roles = constructionMapper.roleListByName(name);
+        return roles;
+    }
 }
 

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/utils/MyImportUtils.java

@@ -225,18 +225,18 @@ public class MyImportUtils {
                 model.addAttribute("pass_construction1","0");
             }else {
                 //设计变更
-                if (null!=construction.getDisclose().getInconsistentDescription()){//图纸现场不一致说明
+                if (null!=construction.getDisclose().getInconsistentDescription()&&!"".equals(construction.getDisclose().getInconsistentDescription())){//图纸现场不一致说明
                     if ("否".equals(construction.getDisclose().getLineName())||//线路名称一致性
                             "否".equals(construction.getDisclose().getQuantities())||//工程量是否一致
                             !"".equals(construction.getDisclose().getImplementedContent())){//已实施内容描述不为空
                         model.addAttribute("pass_construction2","0");
                     }else {
-                        if (construction.getDisclose().getAdministrationType().equals("1.无")){//政处类型
+                        if (construction.getDisclose().getAdministrationType().contains("无")){//政处类型
                             model.addAttribute("pass_construction7","0");
                         }
                     }
                 }else {
-                    if (construction.getDisclose().getAdministrationType().equals("1.无")){//政处类型
+                    if (construction.getDisclose().getAdministrationType().contains("无")){//政处类型
                         model.addAttribute("pass_construction7","0");
                     }
                 }

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/ConstructionController.java

@@ -7,7 +7,9 @@ import java.util.*;
 
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Disclose;
+import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyImportUtils;
+import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
 
 import com.google.common.collect.Maps;
@@ -21,6 +23,7 @@ import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
+import com.jeeplus.modules.sys.utils.UserUtils;
 import org.activiti.engine.*;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -108,12 +111,8 @@ public class ConstructionController extends BaseController {
      * */
     @RequestMapping(value = "artificial")
     public String form2(Construction construction, Model model) {
-//        String proId = construction.getAct().getProcDefId();
-//        String pInId = construction.getProcInsId();
-//        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
-//        RepositoryService rs = processEngine.getRepositoryService();
         MyImportUtils.getTheEcho(construction,model);
-        //根据流程定义号获取所有的定义流程
+        //获取发起人
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/artificialJudgment";
     }
@@ -282,6 +281,18 @@ public class ConstructionController extends BaseController {
 
     @RequestMapping(value = "editCon")
     public String editCon(Construction construction, Model model) {
+        Disclose disclose1 = construction.getDisclose();
+        if (disclose1 != null) {
+            String administrationType = disclose1.getAdministrationType();
+            if (administrationType != null) {
+                String[] split = administrationType.split(";");
+                List<String> newList = new ArrayList<>();
+                for (int i = 0; i < split.length; i++) {
+                    newList.add(split[i]);
+                }
+                construction.setAdministrationTypeList(newList);
+            }
+        }
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/editCon";
     }
@@ -451,7 +462,12 @@ public class ConstructionController extends BaseController {
         //图纸现场不一致描述
         String inconsistentDescription = disclose.getInconsistentDescription();
         //政处类型
-        String administrationType = disclose.getAdministrationType();
+        List<String> administrationTypeList = construction.getAdministrationTypeList();
+        String a = "";
+        for (String type: administrationTypeList) {
+            a += type + ";";
+        }
+        disclose.setAdministrationType(a);
         //前置条件
         String precondition = disclose.getPrecondition();
         //政策处理描述
@@ -480,20 +496,6 @@ public class ConstructionController extends BaseController {
                 j.setSuccess(false);
                 flag = false;
             }
-        }else if (
-                "2.农村政处".equals(administrationType)
-                ||"3.民事政处/行政政处（公路/水利）".equals(administrationType)
-                ||"4.行政政处（城区道路）".equals(administrationType)
-                ||"5.农村政处;民事政处/行政政处（公路/水利）".equals(administrationType)
-                ||"6.农村政处;行政政处（城区道路）".equals(administrationType)
-                ||"7.民事政处/行政政处（公路/水利）;行政政处（城区道路）".equals(administrationType)
-                ||"8.农村政处;民事政处/行政政处（公路/水利）;行政政处（城区道路）".equals(administrationType)
-        ) {
-            if ("".equals(policyHandlingInstructions) || policyHandlingInstructions == null) {
-                j.setMsg("政策处理描述不能为空");
-                j.setSuccess(false);
-                flag = false;
-            }
         } else if ("户内".equals(placementMode)||"户外".equals(placementMode)) {
             if ("".equals(productionDate)) {
                 j.setMsg("核查环网柜生产日期不能为空");

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/DivideController.java

@@ -96,9 +96,20 @@ public class DivideController extends BaseController {
      */
     @RequestMapping(value = "form/{mode}")
     public String form(@PathVariable String mode, Construction construction, Model model) {
-
         model.addAttribute("construction", construction);
         if ("audit".equals(mode)) {
+            Disclose disclose1 = construction.getDisclose();
+            if (disclose1 != null) {
+                String administrationType = disclose1.getAdministrationType();
+                if (administrationType != null) {
+                    String[] split = administrationType.split(";");
+                    List<String> newList = new ArrayList<>();
+                    for (int i = 0; i < split.length; i++) {
+                        newList.add(split[i]);
+                    }
+                    construction.setAdministrationTypeList(newList);
+                }
+            }
             return "modules/sg/managementcenter/activiti/divideAudit";
         } else {//add
             //项目经理组织交底

src/main/java/com/jeeplus/modules/sg/managementcenter/project/entity/Project.java

@@ -108,6 +108,7 @@ public class Project extends DataEntity<Project> {
     private String acquisitionStatus;//领料状态
     private String constructionStatus;//施工状态
     private String whetherCloseStatus;//是否项目关闭
+    private String settStatus;
     private Integer earlyMaterial;//判断项目是否可以提前发起领料
     private Integer preConstruction;//判断项目是否可以提前施工
 
@@ -171,6 +172,14 @@ public class Project extends DataEntity<Project> {
         this.whetherCloseStatus = whetherCloseStatus;
     }
 
+    public String getSettStatus() {
+        return settStatus;
+    }
+
+    public void setSettStatus(String settStatus) {
+        this.settStatus = settStatus;
+    }
+
     @ExcelField(title = "类型", align = 2, sort = 2)
     public String getType() {
         return type;

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

@@ -115,6 +115,9 @@
 			<if test="constructionStatus != null and  constructionStatus != ''">
 				AND a.construction_status  = #{constructionStatus}
 			</if>
+			<if test="settStatus != null and settStatus != ''">
+				AND a.sett_status = #{settStatus}
+			</if>
 			<if test="earlyMaterial != null">
 				or a.earlyMaterial = #{earlyMaterial}
 			</if>

src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -184,7 +184,17 @@ public class ProjectController extends BaseController {
 		return getBootstrapData(page);
 	}
 
-
+	/**
+	 * 结算项目选择框
+	 * */
+	@ResponseBody
+	@RequestMapping(value = "settData")
+	public Map<String, Object> settData(Project project, HttpServletRequest request, HttpServletResponse response, Model model) {
+		project.setSettStatus("0");
+		project.setConstructionStatus("2");
+		Page<Project> page = projectService.findPage(new Page<Project>(request, response), project);
+		return getBootstrapData(page);
+	}
 
 	/**
 	 * 查看，增加，编辑表单表单页面

src/main/webapp/webpage/modules/sg/audit/record/recordList.jsp

@@ -50,7 +50,7 @@
 			</button>
 		</shiro:hasPermission>--%>
 
-<div  id="recordForm" action="${ctx}/sg/information/importTwo" enctype="multipart/form-data" method="post">
+<div  id="recordForm" action="${ctx}/sg/information/importTwoimportTwo" enctype="multipart/form-data" method="post">
 	<table id="record" width="100%" STYLE="border: 1px solid #dedede;">
 		<tr>
 			<td>选择综合信息表</td>

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

@@ -26,7 +26,16 @@
 					}
 					cValue=cValue+";"+($(this).val());//将选中的值添加到数组chk_value中
 				});
-
+				var implementedContent = $('#implementedContent').val();
+				var policyHandlingInstructions = $('#policyHandlingInstructions').val();
+				var inconsistentDescription = $('#inconsistentDescription').val();
+				var otherProblem = $('#otherProblem').val();
+				if (implementedContent != '') {
+					if (inconsistentDescription == '') {
+						jp.error('图纸现场不一致描述：');
+						return false;
+					}
+				}
 				if (nValue == null || nValue.size() <= 0) {
 					jp.error("请选择问题类型");
 				} else if(flag1==true&&flag2==true){
@@ -40,6 +49,10 @@
 							"taskDefKey":"${construction.act.taskDefKey}",
 							"procInsId":"${construction.act.procInsId}",
 							"procDefId":"${construction.act.procDefId}",
+							"disclose.otherProblem": otherProblem,
+							"disclose.inconsistentDescription": inconsistentDescription,
+							"disclose.policyHandlingInstructions": policyHandlingInstructions,
+							"disclose.implementedContent": implementedContent,
 							"flag":cValue,
 							"projectName":"${fns:unescapeHtml(construction.projectName)}",
 							"comment":window.encodeURI(message)
@@ -133,7 +146,7 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.powerLine)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>停电范围（中间统一用中文分号）：</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red"> </font>停电范围（中间统一用中文分号）：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.blackoutArea)}
 								</td>
@@ -143,7 +156,7 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.projectType)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>政处初步判断：</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red"> </font>政处初步判断：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.preliminaryJudgment)}
 								</td>
@@ -153,7 +166,7 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.civilEngineering)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>钢管杆基础类型：</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red"> </font>钢管杆基础类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.baseType)}
 								</td>
@@ -163,7 +176,7 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.planApproval)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备改造类型：</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red"> </font>设备改造类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.transformationType)}
 								</td>
@@ -173,7 +186,7 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.transformationEquipment)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含新设备命名：</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red"> </font>是否含新设备命名：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.newNamed)}
 								</td>
@@ -183,7 +196,7 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.putInto)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含非涉电电气施工：</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red"> </font>是否含非涉电电气施工：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.electricalConstruction)}
 								</td>
@@ -193,7 +206,7 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.theAssignment)}
 							</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含自动化：</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red"> </font>是否含自动化：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.automation)}
 								</td>
@@ -203,7 +216,7 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.remote)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>通信方式：</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red"> </font>通信方式：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.communicationMode)}
 								</td>
@@ -213,7 +226,7 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.inSitu)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>环网柜DTU户外或户内：</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red"> </font>环网柜DTU户外或户内：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.networkCabinet)}
 								</td>
@@ -223,17 +236,40 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.station)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否为停电打包项目：</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red"> </font>是否为停电打包项目：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.powerFailure)}
 								</td>
 							</tr>
 							<tr>
+								<td class="width-15 active"><label class="pull-right">其他问题描述：</label></td>
+								<td class="width-35">
+									<form:input id="otherProblem" path="disclose.otherProblem" cssClass="form-control " />
+								</td>
+								<td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
+								<td class="width-35">
+									<form:input id="policyHandlingInstructions"
+												path="disclose.policyHandlingInstructions" cssClass="form-control" />
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">已实施内容描述</label></td>
+								<td class="width-35">
+									<form:input id="implementedContent" path="disclose.implementedContent" cssClass="form-control" />
+								</td>
+								<td class="width-15 active"><label class="pull-right"> 图纸现场不一致描述：</label></td>
+								<td class="width-35">
+									<form:input id="inconsistentDescription" path="disclose.inconsistentDescription"
+												cssClass="form-control" />
+								</td>
+							</tr>
+	<%--						<c:if test="${flag > 0}">
+							<tr>
 								<td class="width-15 active"><label class="pull-right">施工通道：</label></td>
 								<td class="width-35">
 										${construction.disclose.channel}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备基础是否可以扩容：</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red"> </font>设备基础是否可以扩容：</label></td>
 								<td class="width-35">
 										${construction.disclose.capacity}
 								</td>
@@ -243,7 +279,7 @@
 								<td class="width-35">
 										${construction.disclose.sceneSize}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>最多可扩容尺寸：</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red"> </font>最多可扩容尺寸：</label></td>
 								<td class="width-35">
 										${construction.disclose.capacitySize}
 								</td>
@@ -253,7 +289,7 @@
 								<td class="width-35">
 										${construction.disclose.hiddenDanger}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在低压或通信线等影响施工：</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red"> </font>是否存在低压或通信线等影响施工：</label></td>
 								<td class="width-35">
 										${construction.disclose.influenceConstruction}
 								</td>
@@ -263,7 +299,7 @@
 								<td class="width-35">
 										${construction.disclose.projectRepetition}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否已实施：</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red"> </font>是否已实施：</label></td>
 								<td class="width-35">
 										${construction.disclose.implemented}
 								</td>
@@ -279,7 +315,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>线路名称一致性：</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red"> </font>线路名称一致性：</label></td>
 								<td class="width-35">
 										${construction.disclose.lineName}
 								</td>
@@ -289,7 +325,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备、开关、杆号一致性：</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red"> </font>设备、开关、杆号一致性：</label></td>
 								<td class="width-35">
 										${construction.disclose.rodNumber}
 								</td>
@@ -313,7 +349,7 @@
 								<td class="width-35">
 										${construction.disclose.policyHandlingInstructions}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>DTU安放方式核查：</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red"> </font>DTU安放方式核查：</label></td>
 								<td class="width-35">
 										${construction.disclose.placementMode}
 								</td>
@@ -323,7 +359,7 @@
 								<td class="width-35">
 										${construction.disclose.productionDate}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>二次是否是集成模块：</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red"> </font>二次是否是集成模块：</label></td>
 								<td class="width-35">
 										${construction.disclose.integrateModule}
 								</td>
@@ -333,11 +369,12 @@
 								<td class="width-35">
 										${construction.disclose.needReplace}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备是否有整体改造的必要：</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red"> </font>设备是否有整体改造的必要：</label></td>
 								<td class="width-35">
 										${construction.disclose.overallTransformation}
 								</td>
 							</tr>
+							</c:if>--%>
 							</tbody>
 						</table>
 					</form:form>

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

@@ -35,14 +35,18 @@
                 }
             });
 
-            $('select').change(function () {
-                var administrationType = $('#administrationType').val();
-                if (administrationType != '1.无') {
+
+/*            $(":checked").change(function () {
+                var val = this.val();
+                console.log(val);
+                if (val!="无"||val!="") {
                     $('#policyHandlingInstructions').attr('placeholder', '政策处理描述不能为空');
                 } else {
                     $('#policyHandlingInstructions').removeAttr('placeholder');
                 }
-            })
+            });*/
+
+
 
             $('input').change(function () {
                 var implementedContent = $('#implementedContent').val();
@@ -77,15 +81,21 @@
 
 
             $("#reject").click(function () {
-                var administrationType = $('#administrationType').val();
                 var implementedContent = $('#implementedContent').val();
                 var policyHandlingInstructions = $('#policyHandlingInstructions').val();
                 var inconsistentDescription = $('#inconsistentDescription').val();
                 var otherProblem = $('#otherProblem').val();
-                if (administrationType != '1.无') {
-                    if (policyHandlingInstructions == '') {
-                        jp.error('政策处理说明不能为空')
-                        return false;
+                var val = getVal();
+                if (val.indexOf('无') >= 0 && val.indexOf(";") >= 1) {
+                    jp.error("无不可以和其它类型一起选择");
+                    return false;
+                } else {
+                    var number = val.indexOf('无');
+                    if (val.indexOf('无') != 0){
+                        if (policyHandlingInstructions == '') {
+                            jp.error("政策处理说明不能为空");
+                            return false;
+                        }
                     }
                 }
                 if (implementedContent != '') {
@@ -103,11 +113,11 @@
                             "taskDefKey": "${construction.act.taskDefKey}",
                             "procInsId": "${construction.act.procInsId}",
                             "procDefId": "${construction.act.procDefId}",
-                            "disclose.otherProblem":otherProblem,
-                            "disclose.inconsistentDescription":inconsistentDescription,
-                            "disclose.policyHandlingInstructions":policyHandlingInstructions,
-                            "disclose.implementedContent":implementedContent,
-                            "administrationType":administrationType,
+                            "disclose.otherProblem": otherProblem,
+                            "disclose.inconsistentDescription": inconsistentDescription,
+                            "disclose.policyHandlingInstructions": policyHandlingInstructions,
+                            "disclose.implementedContent": implementedContent,
+                            "administrationType": val,
                             "cId": cId,
                             "flag": "no",
                             "comment": window.encodeURI(message)
@@ -119,7 +129,7 @@
                             }
                         })
                 });
-            })
+            });
 
 
             $('#startTime').datetimepicker({
@@ -140,6 +150,17 @@
                 }
             });
         });
+        function checkboxOnclick(checkbox){
+            console.log('1')
+        }
+        function getVal(groups){
+            var chk_value =[];//定义一个数组
+            $('input[name="administrationTypeList"]:checked').each(function(){//遍历每一个名字为nodes的复选框，其中选中的执行函数
+                chk_value.push($(this).val());//将选中的值添加到数组chk_value中
+            });
+            groups = chk_value.join(";");
+            return groups
+        }
     </script>
 </head>
 <body>
@@ -186,17 +207,7 @@
                             <tr>
                                 <td class="width-15 active"><label class="pull-right">政处类型：</label></td>
                                 <td class="width-35">
-                                    <form:select id="administrationType" path="disclose.administrationType"
-                                                 cssClass="form-control">
-                                        <form:option value="1.无"/>
-                                        <form:option value="2.农村政处"/>
-                                        <form:option value="3.民事政处/行政政处（公路/水利）"/>
-                                        <form:option value="4.行政政处（城区道路）"/>
-                                        <form:option value="5.农村政处;民事政处/行政政处（公路/水利）"/>
-                                        <form:option value="6.农村政处;行政政处（城区道路）"/>
-                                        <form:option value="7.民事政处/行政政处（公路/水利）;行政政处（城区道路）"/>
-                                        <form:option value="8.农村政处;民事政处/行政政处（公路/水利）;行政政处（城区道路）"/>
-                                    </form:select>
+                                    <form:checkboxes onclick="checkboxOnclick(this)" path="administrationTypeList" items="${fns:getDictList('administrationType')}" itemLabel="label" itemValue="value" htmlEscape="false" cssClass="i-checks required"/>
                                 </td>
                                 <td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
                                 <td class="width-35">

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

@@ -63,6 +63,21 @@
         });
 
         function save() {
+            var val = getVal();
+            console.log(val);
+            var policyHandlingInstructions = $('#policyHandlingInstructions').val();
+            if (val.indexOf('无') >= 0 && val.indexOf(";") >= 1) {
+                jp.error("无不可以和其它类型一起选择");
+                return false;
+            } else {
+                var number = val.indexOf('无');
+                if (val.indexOf('无') != 0){
+                    if (policyHandlingInstructions == '') {
+                        jp.error("政策处理说明不能为空");
+                        return false;
+                    }
+                }
+            }
             jp.loading();
             jp.post("${ctx}/managementcenter/activiti/editConSave", $("#inputForm").serialize(), function (data) {
                 if (data.success) {
@@ -75,6 +90,14 @@
                 }
             })
         }
+        function getVal(groups){
+            var chk_value =[];//定义一个数组
+            $('input[name="administrationTypeList"]:checked').each(function(){//遍历每一个名字为nodes的复选框，其中选中的执行函数
+                chk_value.push($(this).val());//将选中的值添加到数组chk_value中
+            });
+            groups = chk_value.join(";");
+            return groups
+        }
     </script>
 </head>
 <body>
@@ -184,8 +207,8 @@
                                 </td>
                                 <td class="width-15 active"><label class="pull-right">政处类型：</label></td>
                                 <td class="width-35">
-                                    <form:select id="administrationType" path="disclose.administrationType"
-                                                 cssClass="form-control">
+                                    <form:checkboxes onclick="checkboxOnclick(this)" path="administrationTypeList" items="${fns:getDictList('administrationType')}" itemLabel="label" itemValue="value" htmlEscape="false" cssClass="i-checks required"/>
+<%--                                    <form:select id="administrationType" path="disclose.administrationType" cssClass="form-control">
                                         <form:option value="1.无"/>
                                         <form:option value="2.农村政处"/>
                                         <form:option value="3.民事政处/行政政处（公路/水利）"/>
@@ -194,11 +217,11 @@
                                         <form:option value="6.农村政处;行政政处（城区道路）"/>
                                         <form:option value="7.民事政处/行政政处（公路/水利）;行政政处（城区道路）"/>
                                         <form:option value="8.农村政处;民事政处/行政政处（公路/水利）;行政政处（城区道路）"/>
-                                    </form:select>
+                                    </form:select>--%>
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
+                                <td class="width-15 active"><label class="pull-right">政策处理说明：</label></td>
                                 <td class="width-35">
                                     <form:input id="policyHandlingInstructions"
                                                 path="disclose.policyHandlingInstructions" cssClass="form-control"/>