Merge remote-tracking branch 'origin/master'

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

@@ -159,16 +159,23 @@ public class MyImportUtils {
 
     //人工审核：回显
     public static void getTheEcho(Construction construction, Model model){
+        //前置条件
         if (null!=construction.getDisclose().getPrecondition()&&!"".equals(construction.getDisclose().getPrecondition())){
             model.addAttribute("pass_construction6","0");
         }else {
             //项目关闭
-            if (null!=construction.getDisclose().getExplanationOfNecessity()&&!"".equals(construction.getDisclose().getExplanationOfNecessity())){//必要性问题说明
+            if ("有".equals(construction.getDisclose().getHiddenDanger())||
+                    "是".equals(construction.getDisclose().getInfluenceConstruction())||
+                    "是".equals(construction.getDisclose().getProjectRepetition())||
+                    "是".equals(construction.getDisclose().getImplemented())||//是否已经实施
+                    "无".equals(construction.getDisclose().getTransformer())){//变压器无负荷
                 model.addAttribute("pass_construction1","0");
             }else {
                 //设计变更
                 if (null!=construction.getDisclose().getInconsistentDescription()){//图纸现场不一致说明
-                    if (!"".equals(construction.getDisclose().getInconsistentDescription())){
+                    if ("不一致".equals(construction.getDisclose().getLineName())||
+                            "否".equals(construction.getDisclose().getQuantities())||//工程量是否一致
+                            "不一致".equals(construction.getDisclose().getRodNumber())){//设备开关杠杆一致性
                         model.addAttribute("pass_construction2","0");
                     }else {
                         if (construction.getDisclose().getAdministrationType().equals("4.无")){

src/main/java/com/jeeplus/modules/sg/managementcenter/project/util/ProExcelInfo.java

@@ -124,177 +124,185 @@ public  class ProExcelInfo {
     /*
         对值进行验证
      */
-    public static Boolean getJudgeValue(List<Project> projects){
+    public static String getJudgeValue(List<Project> projects){
         Boolean flag = false;
+        String str = "";
         for (Project project:projects){
             if (null==project.getDistributionEngineering()){//配网工程专职角色
                 flag = true;
+            }else {
+                str+="配网工程专职角色不能为空;";
             }
             if (null==project.getDistributionMaterials()){//配网物资专职角色
+                str+="配网工程专职角色不能为空;";
                 flag = true;
             }
             if (null==project.getDistributionSystem()){//配网系统专职角色
+                str+="配网工程专职角色不能为空;";
                 flag = true;
             }
             if (null==project.getDistributionPolicy()){//配网政策处理专职角色
+                str+="配网工程专职角色不能为空;";
                 flag = true;
             }
             if (null==project.getManagementLeader()){//项目管理中心领导角色
+                str+="配网工程专职角色不能为空;";
                 flag = true;
             }
             if (null==project.getRunUnit()){//运行单位
+                str+="配网工程专职角色不能为空;";
                 flag = true;
             }
             if (null==project.getRunUnitRole()){//运行单位角色
+                str+="配网工程专职角色不能为空;";
                 flag = true;
             }
             if (null==project.getThroughResearchRole()){//经研所角色
+                str+="配网工程专职角色不能为空;";
                 flag = true;
             }
             if (null==project.getConstructionUnit()){//施工单位
+                str+="配网工程专职角色不能为空;";
                 flag = true;
             }
             if (null==project.getConstructionUnitRole()){//施工单位:施工单位角色
+                str+="配网工程专职角色不能为空;";
                 flag = true;
             }
             if (null==project.getDesignUnit()){//设计单位
+                str+="配网工程专职角色不能为空;";
                 flag = true;
             }
             if (null==project.getDesignUnitRole()){//设计单位角色
+                str+="配网工程专职角色不能为空;";
                 flag = true;
             }
-            if (flag){
-                break;
-            }
-            if (null!=project.getType()){
+            if (null!=project.getType()){//类型
                 flag = getJudge(project.getType(), PRO_TYPE);
                 if (flag){
-                    break;
+                    str+="类型填写有误;";
                 }
             }
-            if (null!=project.getDemandUnit()){
+            if (null!=project.getDemandUnit()){//需求提出单位
                 flag = getJudge(project.getDemandUnit(),PRO_NAME);
                 if (flag){
-                    break;
+                    str+="需求提出单位填写有误;";
                 }
             }
-//            if (null!=project.getProjectManageRole()){//项目经理角色
-//                String loginName = UserUtils.getUser().getLoginName();
-//                if (!loginName.equals(project.getProjectManageRole())){
-//                    flag= true;
-//                }
-//            }
             if (null!=project.getClarificaitonType()){//交底类型
                 flag = getJudge(project.getClarificaitonType(),PRO_CLARIFICAITON);
                 if (flag){
-                    break;
+                    str+="交底类型填写有误;";
                 }
             }
             if (null!=project.getPowerScope()){//停电范围
                 flag = getJudge(project.getPowerScope(), PRO_POWERSCOPE);
                 if (flag){
-                    break;
+                    str+="停单范围填写有误;";
                 }
             }
             if (null!=project.getProjectType()){//项目类型
                 flag = getJudge(project.getProjectType(), PRO_PROJECT_TYPE);
                 if (flag){
-                    break;
+                    str+="项目类型填写有误;";
                 }
             }
             if (null!=project.getPowerFlagPackage()){//是否为停电打包项目
                 flag = getJudge(project.getPowerFlagPackage(), PRO_FLAG);
                 if (flag){
-                    break;
+                    str+="是否为停电打包项目填写有误;";
                 }
             }
             if (null!=project.getPreliminaryJudgment()){//政策初步判断
                 flag = getJudge(project.getPreliminaryJudgment(), PRO_PRE_JUDGEMENT);
                 if (flag){
-                    break;
+                    str+="政策初步判断填写有误;";
                 }
             }
             if (null!=project.getFlagCivilEngineering()){//是否含土建
                 flag = getJudge(project.getFlagCivilEngineering(),PRO_FLAG_CIVIL);
                 if (flag){
-                    break;
+                    str+="是否含土建填写有误;";
                 }
             }
             if (null!=project.getSteelTubePole()){//钢管杆基础类类型
                 flag = getJudge(project.getSteelTubePole(),PRO_STEEL_TUBE);
                 if (flag){
-                    break;
+                    str+="钢管杆基础类类型填写有误;";
                 }
             }
             if (null!=project.getFlagApprovalPlanning()){//是否需要规划报批
                 flag = getJudge(project.getFlagApprovalPlanning(),PRO_FLAG);
                 if (flag){
-                    break;
+                    str+="是否需要规划报批填写有误;";
                 }
             }
             if (null!=project.getEquCreateType()){//设备改造类型
                 flag = getJudge(project.getEquCreateType(),PRO_EQU_TYPE);
                 if (flag){
-                    break;
+                    str+="设备改造类型填写有误;";
                 }
             }
             if (null!=project.getFlagNewEquName()){//是否含新设备命名
                 flag = getJudge(project.getFlagNewEquName(),PRO_FLAG);
                 if (flag){
-                    break;
+                    str+="是否含新设备命名填写有误;";
                 }
             }
             if (null!=project.getIncludeBdzNews()){//是否含变电站新间间隔投运
                 flag = getJudge(project.getIncludeBdzNews(),PRO_FLAG);
                 if (flag){
-                    break;
+                    str+="是否含变电站新间间隔投运填写有误;";
                 }
             }
             if (null!=project.getFlagNoElectrical()){//是否含非设电电气施工
                 flag = getJudge(project.getFlagNoElectrical(),PRO_FLAG);
                 if (flag){
-                    break;
+                    str+="是否含非设电电气施工填写有误;";
                 }
             }
             if (null!=project.getDrawingsWork()){//图纸标注的带点作业情况
                 flag = getJudge(project.getDrawingsWork(),PRO_DRAWING_WORK);
                 if (flag){
-                    break;
+                    str+="图纸标注的带点作业情况填写有误;";
                 }
             }
             if (null!=project.getFlagAutomation()){//是否含自动化
                 flag = getJudge(project.getFlagAutomation(),PRO_FLAG);
                 if (flag){
-                    break;
+                    str+="是否含自动化填写有误;";
                 }
             }
             if (null!=project.getTwoAndThreeRemote()){//二或三
                 flag = getJudge(project.getTwoAndThreeRemote(),PRO_TWO_THREE);
                 if (flag){
-                    break;
+                    str+="二摇或三摇填写有误;";
                 }
             }
             if (null!=project.getPhoneStyle()){//通信方式
                 flag = getJudge(project.getPhoneStyle(),PRO_PHONE_STYLE);
                 if (flag){
-                    break;
+                    str+="通信方式填写有误;";
                 }
             }
             if (null!=project.getStayOpenArea()){//柱开集中或就业地
                 flag = getJudge(project.getStayOpenArea(),PRO_STAY_AREA);
                 if (flag){
-                    break;
+                    str+="柱开集中或就业地填写有误;";
                 }
             }
             if (null!=project.getRingNetworkCabinet()){//环网柜
                 flag = getJudge(project.getRingNetworkCabinet(),PRO_RING_NETWORK);
                 if (flag){
-                    break;
+                    str+="环网柜填写有误;";
                 }
             }
 
         }
-        return flag;
+        if (!"".equals(str)){
+            return str;
+        }
+        return str;
     }
 
     public static Boolean getJudge(String name,String[] strings){

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

@@ -149,11 +149,11 @@ public class ProjectController extends BaseController {
 		List<Project> projects = new ArrayList<Project>();
 		projects.add(project);
 		String loginName = UserUtils.getUser().getLoginName();
-		Boolean judgeValue = ProExcelInfo.getJudgeValue(projects);
+		String judgeValue = ProExcelInfo.getJudgeValue(projects);
 		if (project.getIsNewRecord()){
-			if (judgeValue||!project.getProjectManageRole().equals(loginName)){
+			if (!"".equals(judgeValue)||!project.getProjectManageRole().equals(loginName)){
 				j.setSuccess(false);
-				j.setMsg("新建失败：数据不符合规范");
+				j.setMsg("新建失败:"+judgeValue+"数据不符合规范");
 				return j;
 			}
 			project.preInsert();
@@ -161,9 +161,9 @@ public class ProjectController extends BaseController {
 			j.setSuccess(true);
 			j.setMsg("保存需求基本信息成功");
 		}else{
-			if (judgeValue||!project.getProjectManageRole().equals(loginName)){
+			if (!"".equals(judgeValue)||!project.getProjectManageRole().equals(loginName)){
 				j.setSuccess(false);
-				j.setMsg("修改失败：数据不符合规范");
+				j.setMsg("修改失败："+judgeValue+"数据不符合规范");
 				return j;
 			}
 			project.preUpdate();
@@ -275,10 +275,10 @@ public class ProjectController extends BaseController {
 				return j;
 			}
 			List<Project> projects =ProExcelInfo.getSureProjects(ProExcelInfo.getProjectUtil(importUtil));
-			Boolean judgeValue = ProExcelInfo.getJudgeValue(projects);
-			if (judgeValue){
+			String judgeValue = ProExcelInfo.getJudgeValue(projects);
+			if (!"".equals(judgeValue)){
 				j.setSuccess(false);
-				j.setMsg("导入失败：数据不符合规范,请调整后重新导入");
+				j.setMsg("导入失败："+judgeValue+"数据不符合规范！");
 				return j;
 			}
 			projectService.saveList(projects);

src/main/webapp/webpage/modules/sg/managementcenter/project/projectForm.jsp

@@ -215,7 +215,7 @@
 				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>是否为停电打包项目：</label></td>
 					<td class="width-35">
-						<form:input path="preliminaryJudgment" htmlEscape="false"    class="form-control required"/>
+						<form:input path="powerFlagPackage" htmlEscape="false"    class="form-control required"/>
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>是否含土建（不含钢管杆）：</label></td>
 					<td class="width-35">