施工交底模块完善

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

@@ -1196,11 +1196,11 @@ public class ActTaskService extends BaseService {
 			}
 			if (pass2 == true) {
 				vars.put("pass2", true);
-				vars.put("itemClose", "");
+				vars.put("itemClose", "专职");
 			}
 			if (pass3 == true) {
 				vars.put("pass3", true);
-				vars.put("policy", "");
+				vars.put("policy", "施工单位");
 			}
 			if (pass5 == true) {
 				vars.put("pass5", true);
@@ -1347,7 +1347,7 @@ public class ActTaskService extends BaseService {
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
-	public void auditSave3(Act act,Disclose disclose,Boolean flagDesign,Boolean flagItemCLose,Boolean flagDeal) {
+	public void auditSave3(Act act,Disclose disclose,Boolean flagDesign,Boolean flagItemCLose,String flagDeal) {
 		// 设置意见
 		act.setComment(("yes".equals(act.getFlag())?"[没有问题] ":"[存在问题] ")+act.getComment());
 		act.preUpdate();
@@ -1360,6 +1360,7 @@ public class ActTaskService extends BaseService {
 		vars.put("pass2", false);
 		vars.put("pass3", false);
 		vars.put("pass4", false);
+		vars.put("pass5", false);
         if (null!=disclose.getPrecondition()&&!"".equals(disclose.getPrecondition())){
 			vars.put("pass4", true);
         }else {
@@ -1371,11 +1372,15 @@ public class ActTaskService extends BaseService {
 				vars.put("itemClose","专职");
 				vars.put("pass2",flagItemCLose);
 			}
-			if (flagDeal){
+			if ("民事农村".equals(flagDeal)){
 				vars.put("policy","政策处理");
-				vars.put("pass3",flagDeal);
+				vars.put("pass5",true);
+			}
+			if ("行政".equals(flagDeal)) {
+				vars.put("coveredPerson","政策处理");
+				vars.put("pass3",true);
 			}
-			if (!flagDesign&&!flagItemCLose&&!flagDeal){
+			if (!flagDesign&&!flagItemCLose&&"空".equals(flagDeal)){
 				vars.put("pass",true);
 			}
         }
@@ -1640,14 +1645,23 @@ public class ActTaskService extends BaseService {
 	 */
 	@Transactional(readOnly = false)
 	public void covered(Act act,String fullName) {
-		// 设置意见
-		act.setComment(("yes".equals(act.getFlag())?"[没有问题] ":"[存在问题] ")+act.getComment());
+		Map<String, Object> vars = Maps.newHashMap();
+		String flag = act.getFlag();
+		vars.put("sealYes", false);
+		vars.put("sealNo", false);
+		if ("yes".equals(flag)) {
+			vars.put("sealPerson",fullName);
+			act.setComment("[没有问题]"+act.getComment());
+			vars.put("sealYes", true);
+		} else {
+			vars.put("sealPerson","项目经理");
+			act.setComment("[驳回]" + act.getComment());
+			vars.put("sealNo", true);
+		}
 		act.preUpdate();
 		// 对不同环节的业务逻辑进行操作
 		String taskDefKey = act.getTaskDefKey();
 		// 提交流程任务
-		Map<String, Object> vars = Maps.newHashMap();
-		vars.put("sealPerson",fullName);
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 	/**
@@ -1656,14 +1670,24 @@ public class ActTaskService extends BaseService {
 	 */
 	@Transactional(readOnly = false)
 	public void seal(Act act) {
+		Map<String, Object> vars = Maps.newHashMap();
+		String flag = act.getFlag();
+		vars.put("sealYes", false);
+		vars.put("sealNo", false);
+		if ("yes".equals(flag)) {
+			vars.put("receiptPerson",UserUtils.getUser().getLoginName());
+			act.setComment("[没有问题]"+act.getComment());
+			vars.put("receiptYes", true);
+		} else {
+			vars.put("coveredPerson","施工单位");
+			act.setComment("[驳回]" + act.getComment());
+			vars.put("receiptNo", true);
+		}
 		// 设置意见
-		act.setComment(("yes".equals(act.getFlag())?"[没有问题] ":"[存在问题] ")+act.getComment());
 		act.preUpdate();
 		// 对不同环节的业务逻辑进行操作
 		String taskDefKey = act.getTaskDefKey();
 		// 提交流程任务
-		Map<String, Object> vars = Maps.newHashMap();
-		vars.put("receiptPerson",UserUtils.getUser().getLoginName());
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 	/**
@@ -1672,14 +1696,24 @@ public class ActTaskService extends BaseService {
 	 */
 	@Transactional(readOnly = false)
 	public void  receiptTask(Act act) {
+		Map<String, Object> vars = Maps.newHashMap();
+		String flag = act.getFlag();
+		vars.put("sealYes", false);
+		vars.put("sealNo", false);
+		if ("yes".equals(flag)) {
+			vars.put("singlePerson",UserUtils.getUser().getLoginName());
+			act.setComment("[没有问题]"+act.getComment());
+			vars.put("singleYes", true);
+		} else {
+			vars.put("coveredPerson","施工单位");
+			act.setComment("[驳回]" + act.getComment());
+			vars.put("singleNo", true);
+		}
 		// 设置意见
-		act.setComment(("yes".equals(act.getFlag())?"[没有问题] ":"[存在问题] ")+act.getComment());
 		act.preUpdate();
 		// 对不同环节的业务逻辑进行操作
 		String taskDefKey = act.getTaskDefKey();
 		// 提交流程任务
-		Map<String, Object> vars = Maps.newHashMap();
-		vars.put("singlePerson",UserUtils.getUser().getLoginName());
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 	/**
@@ -1688,14 +1722,24 @@ public class ActTaskService extends BaseService {
 	 */
 	@Transactional(readOnly = false)
 	public void  singleTask(Act act) {
+		Map<String, Object> vars = Maps.newHashMap();
+		String flag = act.getFlag();
+		vars.put("sealYes", false);
+		vars.put("sealNo", false);
+		if ("yes".equals(flag)) {
+			vars.put("policyPay",UserUtils.getUser().getLoginName());
+			act.setComment("[没有问题]"+act.getComment());
+			vars.put("policyYes", true);
+		} else {
+			vars.put("coveredPerson","施工单位");
+			act.setComment("[驳回]" + act.getComment());
+			vars.put("singleNo", true);
+		}
 		// 设置意见
-		act.setComment(("yes".equals(act.getFlag())?"[没有问题] ":"[存在问题] ")+act.getComment());
 		act.preUpdate();
 		// 对不同环节的业务逻辑进行操作
 		String taskDefKey = act.getTaskDefKey();
 		// 提交流程任务
-		Map<String, Object> vars = Maps.newHashMap();
-		vars.put("policyPay",UserUtils.getUser().getLoginName());
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 	/**
@@ -2012,4 +2056,19 @@ public class ActTaskService extends BaseService {
 //		if (null!)
 		return flag;
 	}
+	public String  newJudgeDeal(Disclose disclose){
+		String flag = "空";
+		if (null!=disclose.getAdministrationType()){
+			if (disclose.getAdministrationType().contains("民事政处")||disclose.getAdministrationType().contains("农村政处")){
+				flag = "民事农村";
+			} else if (disclose.getAdministrationType().contains("行政政处(城区道路)")) {
+				flag = "行政";
+			} else {
+				flag = "空";
+			}
+		}
+//		if (null!)
+		return flag;
+	}
+
 }

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

@@ -29,6 +29,7 @@ import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionServ
 import com.jeeplus.modules.sg.managementcenter.activiti.service.DiscloseService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ProcessPersonnelService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.UploadImagesService;
+import groovy.util.IFileNameFinder;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.RuntimeService;
@@ -589,6 +590,19 @@ public class ActTaskController extends BaseController {
 	@RequestMapping(value = "operator")
 	public AjaxJson operator(Act act, String design, String pic, UploadImages uploadImages) {
 		AjaxJson j = new AjaxJson();
+		//获取流程id
+		String procInsId = act.getProcInsId();
+		//根据流程id获取项目需求提出单位
+		String demandUnit = constructionService.demandUnit(procInsId);
+		//根据登陆名查询用户角色
+		String nameFindOffice = constructionService.nameFindOffice(design);
+		if ("经研所需求".equals(demandUnit)) {
+			if (!"经研所".equals(nameFindOffice)) {
+				j.setSuccess(false);
+				j.setMsg("请选择对应的人员");
+				return j;
+			}
+		}
 		try {
 			if (pic!=null&&pic!="") {
 				uploadImages.setPath(pic);
@@ -715,7 +729,7 @@ public class ActTaskController extends BaseController {
 	}
 
 	/**
-	 * 经理审批
+	 * 项目经理组织交底
 	 * @param
 	 */
 	@ResponseBody
@@ -734,7 +748,7 @@ public class ActTaskController extends BaseController {
 		}
 		Boolean flagDesign = actTaskService.isJudgeDesign(disclose);
 		Boolean flagItemCLose =actTaskService.isJudgeItemClose(disclose);
-		Boolean flagDeal =actTaskService.isJudgeDeal(disclose);
+		String flagDeal =actTaskService.newJudgeDeal(disclose);
 		if (null==disclose.getPrecondition()||"".equals(disclose.getPrecondition())){
 			if (flagItemCLose){
 				if (null==disclose.getExplanationOfNecessity()||disclose.getExplanationOfNecessity().equals("")){
@@ -748,12 +762,16 @@ public class ActTaskController extends BaseController {
 					flag = true;
 				}
 			}
-			if (flagDeal){
+			if ("空".equals(flagDeal)) {
+				s += "政策类型不能未空";
+				flag = true;
+			}
+/*			if (flagDeal){
 				if (null==disclose.getPolicyHandlingInstructions()||disclose.getPolicyHandlingInstructions().equals("")){
 					s+=" 政策处理说明不能为空!";
 					flag=true;
 				}
-			}
+			}*/
 			if (flag){
 				j.setSuccess(false);
 				j.setMsg(s);

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

@@ -4,31 +4,96 @@ import com.jeeplus.core.persistence.ActEntity;
 
 public class Disclose  extends ActEntity<Disclose> {
     private static final long serialVersionUID = 1L;
+    //需求项目名称
+    private String requireName;
+    //工程编号
+    private String projectNumber;
+    //项目名称
+    private String projectName;
+    //项目定义号
+    private String projectId;
+    //项目信息id
     private String conId;
+    //施工通道
     private String channel;
+    //设备基础是否可以扩容
     private String capacity;
+    //现场设备尺寸
     private String sceneSize;
+    //最多可扩容尺寸
     private String capacitySize;
+    //方案安全隐患
     private String hiddenDanger;
+    //是否存在低压或通信线等影响施工
     private String influenceConstruction;
+    //立项重复
     private String projectRepetition;
+    //是否已实施
     private String implemented;
+    //变压器无负荷
     private String transformer;
+    //必要性问题说明
+    private String explanationOfNecessity;
+    //线路名称一致性
     private String lineName;
+    //工程量是否一致
     private String quantities;
+    //设备、开关、杆号一致性
     private String rodNumber;
+    //图纸现场不一致说明
+    private String inconsistentDescription;
+    //政处类型
     private String administrationType;
-    private String politicalProblem;
+    //前置条件
     private String precondition;
+    //政策处理说明
+    private String policyHandlingInstructions;
+    //DTU安放方式核查
     private String placementMode;
+    //核查环网柜生产日期
     private String productionDate;
+    //二次是否是集成模块
     private String IntegrateModule;
+    //PT是否需要更换
     private String needReplace;
+    //设备是否有整体改造的必要
     private String overallTransformation;
 
-    private String explanationOfNecessity;//必要性问题说明
-    private String inconsistentDescription;//图纸现场不一致说明
-    private String policyHandlingInstructions;//政策处理说明
+
+
+
+
+    public String getRequireName() {
+        return requireName;
+    }
+
+    public void setRequireName(String requireName) {
+        this.requireName = requireName;
+    }
+
+    public String getProjectNumber() {
+        return projectNumber;
+    }
+
+    public void setProjectNumber(String projectNumber) {
+        this.projectNumber = projectNumber;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
 
     public String getExplanationOfNecessity() {
         return explanationOfNecessity;
@@ -166,13 +231,6 @@ public class Disclose  extends ActEntity<Disclose> {
         this.administrationType = administrationType;
     }
 
-    public String getPoliticalProblem() {
-        return politicalProblem;
-    }
-
-    public void setPoliticalProblem(String politicalProblem) {
-        this.politicalProblem = politicalProblem;
-    }
 
     public String getPrecondition() {
         return precondition;
@@ -239,7 +297,6 @@ public class Disclose  extends ActEntity<Disclose> {
                 ", quantities='" + quantities + '\'' +
                 ", rodNumber='" + rodNumber + '\'' +
                 ", administrationType='" + administrationType + '\'' +
-                ", politicalProblem='" + politicalProblem + '\'' +
                 ", precondition='" + precondition + '\'' +
                 ", placementMode='" + placementMode + '\'' +
                 ", productionDate='" + productionDate + '\'' +

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

@@ -30,4 +30,9 @@ public interface ConstructionMapper extends BaseMapper<Construction> {
     void newSave(Construction construction);
 
     void updateExamine(Construction construction);
+
+    //根据流程id查询项目的需求提出单位
+    String demandUnit(String procInsId);
+
+
 }

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

@@ -34,13 +34,16 @@
 		d.quantities AS "disclose.quantities",
 		d.rodNumber AS "disclose.rodNumber",
 		d.administrationType AS "disclose.administrationType",
-		d.politicalProblem AS "disclose.politicalProblem",
 		d.precondition AS "disclose.precondition",
 		d.placementMode AS "disclose.placementMode",
 		d.productionDate AS "disclose.productionDate",
 		d.IntegrateModule AS "disclose.IntegrateModule",
 		d.needReplace AS "disclose.needReplace",
-		d.overallTransformation AS "disclose.overallTransformation"
+		d.overallTransformation AS "disclose.overallTransformation",
+		d.explanationOfNecessity AS "disclose.explanationOfNecessity",
+		d.inconsistentDescription AS "disclose.inconsistentDescription",
+		d.policyHandlingInstructions AS "disclose.policyHandlingInstructions"
+
 	</sql>
 
 
@@ -263,4 +266,7 @@
 			examine_date = #{examineDate}
 		WHERE id = #{id}
 	</update>
+	<select id="demandUnit" resultType="string">
+		select demand_unit from xm_project_details where require_name = (select project_name from xm_construction_clarificaiton where proc_ins_id = #{procInsId});
+	</select>
 </mapper>

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

@@ -48,15 +48,15 @@
 
 	<select id="get" resultMap="ConstructionResult" >
 		SELECT 
-			<include refid="constructionColumns"/>
+			*
 		FROM xm_disclose_conclusion a
 		<include refid="constructionJoins"/>
 		WHERE a.proc_ins_id = #{procInsId}
 	</select>
 	
 	<select id="findList" resultMap="ConstructionResult" >
-		SELECT 
-			<include refid="constructionColumns"/>
+		SELECT
+			*
 		FROM xm_disclose_conclusion a
 		<include refid="constructionJoins"/>
 		<where>
@@ -74,8 +74,8 @@
 	</select>
 	
 	<select id="findAllList" resultMap="ConstructionResult" >
-		SELECT 
-			<include refid="constructionColumns"/>
+		SELECT
+			*
 		FROM xm_disclose_conclusion a
 		<include refid="constructionJoins"/>
 		<where>
@@ -245,6 +245,10 @@
 			id,
 			proc_ins_id,
 			conId,
+			requireName,
+			projectNumber,
+			projectName,
+			projectId,
 			channel,
 			capacity,
 			sceneSize,
@@ -254,20 +258,19 @@
 			projectRepetition,
 			implemented,
 			transformer,
+			explanationOfNecessity,
 			lineName,
 			quantities,
 			rodNumber,
+			inconsistentDescription,
 			administrationType,
-			politicalProblem,
 			precondition,
+			policyHandlingInstructions,
 			placementMode,
 			productionDate,
 			IntegrateModule,
 			needReplace,
 			overallTransformation,
-			explanationOfNecessity,
-			inconsistentDescription,
-			policyHandlingInstructions,
 			create_by,
 			create_date,
 			update_by,
@@ -278,6 +281,10 @@
 			#{id},
 			#{procInsId},
 			#{conId},
+			#{requireName},
+			#{projectNumber},
+			#{projectName},
+			#{projectId},
 			#{channel},
 			#{capacity},
 			#{sceneSize},
@@ -287,20 +294,19 @@
 			#{projectRepetition},
 			#{implemented},
 			#{transformer},
+			#{explanationOfNecessity},
 			#{lineName},
 			#{quantities},
 			#{rodNumber},
+			#{inconsistentDescription},
 			#{administrationType},
-			#{politicalProblem},
 			#{precondition},
+			#{policyHandlingInstructions},
 			#{placementMode},
 			#{productionDate},
 			#{IntegrateModule},
 			#{needReplace},
 			#{overallTransformation},
-			#{explanationOfNecessity},
-			#{inconsistentDescription},
-			#{policyHandlingInstructions},
 			#{createBy.id},
 			#{createDate},
 			#{updateBy.id},
@@ -308,5 +314,7 @@
 			#{remarks},
 			#{delFlag}
 		)
+
+
 	</insert>
 </mapper>

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

@@ -59,6 +59,9 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 		return constructionMapper.queryPerson(loginName);
 	}
 
+	/**
+	 * 根据登陆名查询角色
+	 * */
 	public String nameFindOffice(String loginName) {
 		return constructionMapper.nameFindOffice(loginName);
 	}
@@ -74,4 +77,9 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 		constructionMapper.updateExamine(construction);
 	}
 
+	//根据流程id查询项目的需求提出单位
+	public String demandUnit(String procInsId) {
+		return constructionMapper.demandUnit(procInsId);
+	}
+
 }

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

@@ -177,9 +177,10 @@ public class ConstructionController extends BaseController {
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/operatorDesignChange";
     }
+
     /*
-        项目关闭，配网工程专职判定
-     */
+              项目关闭，配网工程专职判定
+           */
     @RequestMapping(value = "speciallyForm")
     public String speciallyForm(Construction construction, Model model) {
         //根据流程定义号获取所有的定义流程
@@ -205,6 +206,17 @@ public class ConstructionController extends BaseController {
         return "modules/sg/managementcenter/activiti/memberForm";
     }
 
+
+    /*
+       项目关闭，配网系统专职
+    */
+    @RequestMapping(value = "departmentForm")
+    public String departmentForm(Construction construction, Model model) {
+        //根据流程定义号获取所有的定义流程
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/departmentForm";
+    }
+
 /**
  * 政策处理
  * */
@@ -227,15 +239,6 @@ public class ConstructionController extends BaseController {
         return "modules/sg/managementcenter/activiti/managerPolicesChange";
     }
 
-    /*
-       项目关闭，配网系统专职
-    */
-    @RequestMapping(value = "departmentForm")
-    public String departmentForm(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
-        model.addAttribute("construction", construction);
-        return "modules/sg/managementcenter/activiti/departmentForm";
-    }
     /**
      * 经研所审核页面
      * */
@@ -256,6 +259,69 @@ public class ConstructionController extends BaseController {
         return "modules/sg/managementcenter/activiti/managerDesignChange";
     }
 
+    /**政处处理（行政政处）*/
+
+    /**
+     * 上传未盖章施工方案（行政政处开始）
+     * */
+    @RequestMapping(value = "coveredForm")
+    public String coveredForm(Construction construction, Model model) {
+        //根据流程定义号获取所有的定义流程
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/coveredForm";
+    }
+
+    /**
+     * 施工方案盖章
+     * */
+    @RequestMapping(value = "sealForm")
+    public String sealForm(Construction construction, Model model) {
+        //根据流程定义号获取所有的定义流程
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/sealForm";
+    }
+
+
+
+/*    *//**
+     * 项目经理判断是否需要政策处理（行政政处）
+     * *//*
+    @RequestMapping(value = "sealForm")
+    public String sealForm(Construction construction, Model model) {
+        //根据流程定义号获取所有的定义流程
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/sealForm";
+    }*/
+
+    /**
+     * 上传收据
+     * */
+    @RequestMapping(value = "receiptForm")
+    public String receiptForm(Construction construction, Model model) {
+        //根据流程定义号获取所有的定义流程
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/receiptForm";
+    }
+
+    /**
+     * 上传缴费单
+     * */
+    @RequestMapping(value = "singleForm")
+    public String singleForm(Construction construction, Model model) {
+        //根据流程定义号获取所有的定义流程
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/singleForm";
+    }
+
+    /**
+     * 上传借款单据
+     * */
+    @RequestMapping(value = "documentsForm")
+    public String documentsForm(Construction construction, Model model) {
+        //根据流程定义号获取所有的定义流程
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/documentsForm";
+    }
 
     /**
      * 保存请假申请

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

@@ -185,30 +185,36 @@ public class DivideController extends BaseController {
 				Row row = ei.getRow(i);
 				disclose.setProcInsId(procInsId);
 				projectName = URLDecoder.decode(projectName, "UTF-8");
-				disclose.setConId(projectName);
-				disclose.setChannel(ei.getCellValue(row, 0 ).toString());
-				disclose.setCapacity(ei.getCellValue(row, 1 ).toString());
-				disclose.setSceneSize(ei.getCellValue(row, 2 ).toString());
-				disclose.setCapacitySize(ei.getCellValue(row, 3 ).toString());
-				disclose.setHiddenDanger(ei.getCellValue(row, 4 ).toString());
-				disclose.setInfluenceConstruction(ei.getCellValue(row, 5 ).toString());
-				disclose.setProjectRepetition(ei.getCellValue(row, 6 ).toString());
-				disclose.setImplemented(ei.getCellValue(row, 7 ).toString());
-				disclose.setTransformer(ei.getCellValue(row, 8 ).toString());
-				disclose.setExplanationOfNecessity(ei.getCellValue(row, 9).toString());
-				disclose.setLineName(ei.getCellValue(row, 10 ).toString());
-				disclose.setQuantities(ei.getCellValue(row, 11).toString());
-				disclose.setRodNumber(ei.getCellValue(row, 12).toString());
-				disclose.setInconsistentDescription(ei.getCellValue(row, 13).toString());
-				disclose.setAdministrationType(ei.getCellValue(row, 14).toString());
-				disclose.setPoliticalProblem(ei.getCellValue(row, 15).toString());
-				disclose.setPrecondition(ei.getCellValue(row, 16).toString());
-				disclose.setPolicyHandlingInstructions(ei.getCellValue(row, 17).toString());
-				disclose.setPlacementMode(ei.getCellValue(row, 18).toString());
-				disclose.setProductionDate(ei.getCellValue(row, 19).toString());
-				disclose.setIntegrateModule(ei.getCellValue(row, 20).toString());
-				disclose.setNeedReplace(ei.getCellValue(row, 21).toString());
-				disclose.setOverallTransformation(ei.getCellValue(row, 22).toString());
+				String requireName = ei.getCellValue(row, 1).toString();
+				if (projectName.equals(requireName)) {
+					disclose.setRequireName(requireName);
+					disclose.setConId(requireName);
+					disclose.setProjectNumber(ei.getCellValue(row, 2).toString());
+					disclose.setProjectName(ei.getCellValue(row, 3).toString());
+					disclose.setProjectId(ei.getCellValue(row, 4).toString());
+					disclose.setChannel(ei.getCellValue(row, 5).toString());
+					disclose.setCapacity(ei.getCellValue(row, 6).toString());
+					disclose.setSceneSize(ei.getCellValue(row, 7).toString());
+					disclose.setCapacitySize(ei.getCellValue(row, 8).toString());
+					disclose.setHiddenDanger(ei.getCellValue(row, 9).toString());
+					disclose.setInfluenceConstruction(ei.getCellValue(row, 10).toString());
+					disclose.setProjectRepetition(ei.getCellValue(row, 11).toString());
+					disclose.setImplemented(ei.getCellValue(row, 12).toString());
+					disclose.setTransformer(ei.getCellValue(row, 13).toString());
+					disclose.setExplanationOfNecessity(ei.getCellValue(row, 14).toString());
+					disclose.setLineName(ei.getCellValue(row, 15).toString());
+					disclose.setQuantities(ei.getCellValue(row, 16).toString());
+					disclose.setRodNumber(ei.getCellValue(row, 17).toString());
+					disclose.setInconsistentDescription(ei.getCellValue(row, 18).toString());
+					disclose.setAdministrationType(ei.getCellValue(row, 19).toString());
+					disclose.setPrecondition(ei.getCellValue(row, 20).toString());
+					disclose.setPolicyHandlingInstructions(ei.getCellValue(row, 21).toString());
+					disclose.setPlacementMode(ei.getCellValue(row, 22).toString());
+					disclose.setProductionDate(ei.getCellValue(row, 23).toString());
+					disclose.setIntegrateModule(ei.getCellValue(row, 24).toString());
+					disclose.setNeedReplace(ei.getCellValue(row, 25).toString());
+					disclose.setOverallTransformation(ei.getCellValue(row, 26).toString());
+				}
 			}
 			try {
 				discloseService.newInsert(disclose);

src/main/resources/j2cache/j2cache.properties

@@ -88,8 +88,8 @@ redis.cluster_name = j2cache
 redis.namespace = 
 
 ## connection
-redis.hosts = 127.0.0.1:6379
-#redis.hosts = 192.168.2.4:6380
+#redis.hosts = 127.0.0.1:6379
+redis.hosts = 192.168.2.4:6380
 redis.timeout = 2000
 redis.password =
 redis.database = 0

src/main/resources/properties/jeeplus.properties

@@ -14,10 +14,10 @@
 #mysql database setting
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
-#jdbc.url=jdbc:mysql://192.168.2.4:3306/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
-jdbc.url=jdbc:mysql://localhost:3306/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
+jdbc.url=jdbc:mysql://192.168.2.4:3306/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
+#jdbc.url=jdbc:mysql://localhost:3306/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 jdbc.username=root
-jdbc.password=123456
+jdbc.password=root
 jdbc.testSql=SELECT 'x'
 jdbc.dual =
 

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

@@ -10,16 +10,35 @@
 		$(document).ready(function () {
 			$("#agree").click(function () {
 				var cValue ="";//定义一个数组
+				var flag1 = false;//代表是否选择了设计变更/行政政处/农村民事政处的状态，false为未选择，true为选择
+				var flag2 = false;//代表是否选择了项目关闭的状态，false为未选择，true为选择
+				var flag3 = false;//代表是否选择了政策处理(行政政处)
+				var flag4 = false;//代表是否选择了政策处理(农村/民事)
 				var nValue = $('input[name="favorite"]:checked');
 				$('input[name="favorite"]:checked').each(function(){//遍历每一个名字为interest的复选框，其中选中的执行函数
-					console.log($(this).val());
+					if ("pass2" == $(this).val()) {
+						flag2 = true;
+					} else {
+						flag1 = true;
+					}
+					if ("pass3"==$(this).val()) {
+						flag3 = true;
+					}
+					if ("pass5"==$(this).val()) {
+						flag4 = true;
+					}
 					cValue=cValue+";"+($(this).val());//将选中的值添加到数组chk_value中
 				});
+
 				if (nValue == null || nValue.size() <= 0) {
 					jp.error("请选择问题类型");
-				} else {
-					console.log("cValue="+cValue);
-					console.log("nValue="+nValue.size());
+				} else if(flag1==true&&flag2==true){
+					jp.error("项目关闭与其它类型问题不可同时发起");
+				}else if (flag3==true&&flag4==true){
+					jp.error("政处类型只能选择一种");
+				}else {
+/*					console.log("cValue="+cValue);
+					console.log("nValue="+nValue.size());*/
 					jp.prompt(" 审批意见", function (message) {
 						jp.post("${ctx}/act/task/artificialTask",
 						{
@@ -100,7 +119,7 @@
 								<td class="width-35">
 									<input type="checkbox" name="favorite" value="pass1"> 设计变更 &nbsp;
 									<input type="checkbox" name="favorite" value="pass2"> 项目关闭 &nbsp;
-									<input type="checkbox" name="favorite" value="pass3"> 政策处理 &nbsp;
+									<input type="checkbox" name="favorite" value="pass3"> 政策处理(行政政处)
 									<input type="checkbox" name="favorite" value="pass5"> 政策处理(农村/民事) &nbsp;
 								</td>
 							</tr>

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

@@ -28,7 +28,7 @@
                             "taskDefKey": "${construction.act.taskDefKey}",
                             "procInsId": "${construction.act.procInsId}",
                             "procDefId": "${construction.act.procDefId}",
-							"fullName":"政策处理2",
+							"fullName":"政策处理",
 							"pic":currentFileValues,
                             "flag": "yes",
                             "comment": window.encodeURI(message)
@@ -41,6 +41,27 @@
                         })
                 })
 			});
+			$("#no").click(function () {
+				jp.prompt("驳回", function (message) {
+					jp.post("${ctx}/act/task/coveredTask",
+							{
+								"taskId": "${construction.act.taskId}",
+								"taskName": "${construction.act.taskName}",
+								"taskDefKey": "${construction.act.taskDefKey}",
+								"procInsId": "${construction.act.procInsId}",
+								"procDefId": "${construction.act.procDefId}",
+								"fullName":"政策处理2",
+								"flag": "no",
+								"comment": window.encodeURI(message)
+							},
+							function (data) {
+								if(data.success){
+									jp.success(data.msg);
+									jp.go("${ctx}/act/task/todo")
+								}
+							})
+				})
+			});
 		})
 	</script>
 </head>
@@ -402,7 +423,7 @@
 							<div class="col-sm-6">
 								<div class="form-group text-center">
 									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />&nbsp;
-									<%--<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="不在发起" />--%>
+									<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳回" />
 								</div>
 							</div>
 						</div>

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

@@ -6,6 +6,7 @@
 	<meta name="decorator" content="ani"/>
 	<!-- SUMMERNOTE -->
 	<%@include file="/webpage/include/summernote.jsp" %>
+	<%@include file="economicsDesignChange.js"%>
 	<script type="text/javascript">
 
 		$(document).ready(function() {
@@ -53,6 +54,7 @@
 						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
 					</h3>
 				</div>
+				<table id="testPicTable"   data-toolbar="#toolbar"></table>
 				<div class="panel-body">
 					<form:form id="inputForm" modelAttribute="uploadImages" class="form-horizontal">
 						<form:hidden path="id"/>
@@ -62,9 +64,6 @@
 						<form:hidden path="act.procInsId"/>
 						<form:hidden path="act.procDefId"/>
 						<form:hidden id="flag" path="act.flag" />
-						<div class="form-group text-center">
-							<h3> 设计单位人员上传</h3>
-						</div>
 						<table class="table table-bordered">
 							<tbody>
 							<tr>

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

@@ -45,29 +45,25 @@
 			$("#reject").click(function () {
 				var remark = $("#remark").val();
 				var cId = $("#cId").val();
-				if (remark==null||remark=='') {
-					jp.error("请填写备注");
-				} else {
-					jp.prompt("存在问题, 审批意见", function (message) {
-						jp.post("${ctx}/act/task/audit2",
-						{
-							"taskId":"${construction.act.taskId}",
-							"taskName":"${construction.act.taskName}",
-							"taskDefKey":"${construction.act.taskDefKey}",
-							"procInsId":"${construction.act.procInsId}",
-							"procDefId":"${construction.act.procDefId}",
-							"cId":cId,
-							"flag":"no",
-							"comment":window.encodeURI(remark)
-						},
-						function (data) {
-							if(data.success){
-								jp.success(data.msg);
-								jp.go("${ctx}/act/task/todo")
-							}
-						})
-					});
-				}
+				jp.prompt("存在问题, 审批意见", function (message) {
+					jp.post("${ctx}/act/task/audit2",
+					{
+						"taskId":"${construction.act.taskId}",
+						"taskName":"${construction.act.taskName}",
+						"taskDefKey":"${construction.act.taskDefKey}",
+						"procInsId":"${construction.act.procInsId}",
+						"procDefId":"${construction.act.procDefId}",
+						"cId":cId,
+						"flag":"no",
+						"comment":window.encodeURI(remark)
+					},
+					function (data) {
+						if(data.success){
+							jp.success(data.msg);
+							jp.go("${ctx}/act/task/todo")
+						}
+					})
+				});
 			})
 
 

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

@@ -35,6 +35,26 @@
                         })
                 })
 			});
+			$("#no").click(function () {
+				jp.prompt("驳回", function (message) {
+					jp.post("${ctx}/act/task/receiptTask",
+							{
+								"taskId": "${construction.act.taskId}",
+								"taskName": "${construction.act.taskName}",
+								"taskDefKey": "${construction.act.taskDefKey}",
+								"procInsId": "${construction.act.procInsId}",
+								"procDefId": "${construction.act.procDefId}",
+								"flag": "no",
+								"comment": window.encodeURI(message)
+							},
+							function (data) {
+								if(data.success){
+									jp.success(data.msg);
+									jp.go("${ctx}/act/task/todo")
+								}
+							})
+				})
+			});
 		})
 	</script>
 </head>
@@ -389,7 +409,7 @@
 							<div class="col-sm-6">
 								<div class="form-group text-center">
 									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />&nbsp;
-									<%--<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="不在发起" />--%>
+									<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳回" />
 								</div>
 							</div>
 						</div>

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

@@ -16,12 +16,10 @@
 				if (design==""||design==null) {
 					jp.error("请选择用户")
 					return;
-				}else {
-					if (fabg=="是") {
-						if (pic == "" || pic == null) {
-							jp.error("请上传方案图");
-							return;
-						}
+				}else if (fabg=="是")  {
+					if (pic == "" || pic == null) {
+						jp.error("请上传方案图");
+						return;
 					}
 				}
 				// alert(design);
@@ -43,6 +41,8 @@
 						if(data.success){
 							jp.success(data.msg);
 							jp.go("${ctx}/act/task/todo")
+						}else {
+							jp.error("请选择与需求提出单位对应的人员")
 						}
 					})
 				});
@@ -62,9 +62,9 @@
 								"comment":window.encodeURI(message)
 							},
 							function (data) {
-								if(data.success){
+								if (data.success) {
 									jp.success(data.msg);
-									jp.go("${ctx}/act/task/todo")
+									jp.go("${ctx}/act/task/todo");
 								}
 							})
 				});

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

@@ -35,6 +35,27 @@
                         })
                 })
 			});
+
+			$("#no").click(function () {
+				jp.prompt("驳回", function (message) {
+					jp.post("${ctx}/act/task/receiptTask",
+							{
+								"taskId": "${construction.act.taskId}",
+								"taskName": "${construction.act.taskName}",
+								"taskDefKey": "${construction.act.taskDefKey}",
+								"procInsId": "${construction.act.procInsId}",
+								"procDefId": "${construction.act.procDefId}",
+								"flag": "no",
+								"comment": window.encodeURI(message)
+							},
+							function (data) {
+								if(data.success){
+									jp.success(data.msg);
+									jp.go("${ctx}/act/task/todo")
+								}
+							})
+				})
+			});
 		})
 	</script>
 </head>

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

@@ -36,6 +36,26 @@
 					})
 				});
 			});
+			$("#no").click(function () {
+				jp.prompt("驳回", function (message) {
+					jp.post("${ctx}/act/task/sealTask",
+					{
+						"taskId":"${construction.act.taskId}",
+						"taskName":"${construction.act.taskName}",
+						"taskDefKey":"${construction.act.taskDefKey}",
+						"procInsId":"${construction.act.procInsId}",
+						"procDefId":"${construction.act.procDefId}",
+						"flag":"no",
+						"comment":window.encodeURI(message)
+					},
+					function (data) {
+						if(data.success){
+							jp.success(data.msg);
+							jp.go("${ctx}/act/task/todo")
+						}
+					})
+				});
+			});
 		})
 	</script>
 </head>
@@ -398,7 +418,7 @@
 							<div class="col-sm-6">
 								<div class="form-group text-center">
 									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />
-									<%--<input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="驳回" />&nbsp;--%>
+									<input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="驳回" />
 								</div>
 							</div>
 						</div>

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

@@ -35,6 +35,27 @@
                         })
                 })
 			});
+
+			$("#no").click(function () {
+				jp.prompt("驳回", function (message) {
+					jp.post("${ctx}/act/task/receiptTask",
+							{
+								"taskId": "${construction.act.taskId}",
+								"taskName": "${construction.act.taskName}",
+								"taskDefKey": "${construction.act.taskDefKey}",
+								"procInsId": "${construction.act.procInsId}",
+								"procDefId": "${construction.act.procDefId}",
+								"flag": "no",
+								"comment": window.encodeURI(message)
+							},
+							function (data) {
+								if(data.success){
+									jp.success(data.msg);
+									jp.go("${ctx}/act/task/todo")
+								}
+							})
+				})
+			});
 		})
 	</script>
 </head>
@@ -389,7 +410,7 @@
 							<div class="col-sm-6">
 								<div class="form-group text-center">
 									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />&nbsp;
-									<%--<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="不在发起" />--%>
+									<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳回" />
 								</div>
 							</div>
 						</div>