Merge remote-tracking branch 'origin/master'

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

@@ -2055,7 +2055,7 @@ public class ActTaskService extends BaseService {
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
-	public void covered(Act act,String fullName) {
+	public void covered(Act act) {
 		Map<String, Object> vars = Maps.newHashMap();
 		String flag = act.getFlag();
 		vars.put("sealYes", false);

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

@@ -1005,7 +1005,7 @@ public class ActTaskController extends BaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "coveredTask")
-	public AjaxJson coveredTask(Act act,String fullName,String pic, UploadImages uploadImages) {
+	public AjaxJson coveredTask(Act act,String pic, UploadImages uploadImages) {
 		AjaxJson j = new AjaxJson();
 		try {
 			if (pic!=null&&pic!="") {
@@ -1017,7 +1017,7 @@ public class ActTaskController extends BaseController {
 			}
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
-			actTaskService.covered(act,fullName);
+			actTaskService.covered(act);
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}

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

@@ -214,32 +214,34 @@ public class MyImportUtils {
     //人工审核：回显
     public static void getTheEcho(Construction construction, Model model){
         //前置条件
-        if ((null!=construction.getDisclose().getPrecondition()&&!"".equals(construction.getDisclose().getPrecondition()))
+        if ((null!=construction.getDisclose().getPrecondition()&&!"".equals(construction.getDisclose().getPrecondition()))//前置条件
+                //施工通道
                 ||(null!=construction.getDisclose().getChannel()&&!"".equals(construction.getDisclose().getChannel())&&!"无".equals(construction.getDisclose().getChannel()))
+                //其它问题描述
                 ||(null!=construction.getDisclose().getOtherProblem()&&!"".equals(construction.getDisclose().getOtherProblem()))
         ){
             model.addAttribute("pass_construction6","0");
         }else {
-            if ("有".equals(construction.getDisclose().getHiddenDanger())||
-                    "是".equals(construction.getDisclose().getInfluenceConstruction())||
-                    "是".equals(construction.getDisclose().getProjectRepetition())||
+            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().getLineName())||
+                    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.无")){
+                        if (construction.getDisclose().getAdministrationType().equals("1.无")){//政处类型
                             model.addAttribute("pass_construction7","0");
                         }
                     }
                 }else {
-                    if (construction.getDisclose().getAdministrationType().equals("4.无")){
+                    if (construction.getDisclose().getAdministrationType().equals("1.无")){//政处类型
                         model.addAttribute("pass_construction7","0");
                     }
                 }

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

@@ -272,10 +272,6 @@ public class ConstructionController extends BaseController {
      * */
     @RequestMapping(value = "humanReview")
     public String humanReviewform(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);

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

@@ -266,34 +266,34 @@ public class DivideController extends BaseController {
             for (int i = 1; i < lastDataRowNum; i++) {
                 disclose = new Disclose();
                 Row row = ei.getRow(i);
-                disclose.setRequireName(ei.getCellValue(row, 1).toString());
-                disclose.setConId(ei.getCellValue(row, 1).toString());
-                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.setPolicyHandlingInstructions(ei.getCellValue(row, 20).toString());
-                disclose.setPrecondition(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());
-                disclose.setOtherProblem(ei.getCellValue(row, 27).toString());
+                disclose.setRequireName(ei.getCellValue(row, 1).toString());//需求项目名称
+                disclose.setConId(ei.getCellValue(row, 1).toString());//项目信息id
+                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.setPolicyHandlingInstructions(ei.getCellValue(row, 20).toString());//政策处理说明
+                disclose.setPrecondition(ei.getCellValue(row, 21).toString());//前置条件
+                disclose.setPlacementMode(ei.getCellValue(row, 22).toString()); //DTU安放方式核查
+                disclose.setProductionDate(ei.getCellValue(row, 23).toString());//核查环网柜生产日期
+                disclose.setIntegrateModule(ei.getCellValue(row, 24).toString()); //二次是否是集成模块
+                disclose.setNeedReplace(ei.getCellValue(row, 25).toString());//PT是否需要更换
+                disclose.setOverallTransformation(ei.getCellValue(row, 26).toString());//设备是否有整体改造的必要
+                disclose.setOtherProblem(ei.getCellValue(row, 27).toString());//其它问题描述
                 discloseList.add(disclose);
             }
             //记录所有符合情况的数据

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

@@ -20,7 +20,7 @@
 				    return;
 				}
                 var currentFileValues = $("input[name='pic']").val();
-                jp.prompt("重新发起配网工程专职判定", function (message) {
+                jp.prompt("通过", function (message) {
                     jp.post("${ctx}/act/task/coveredTask",
                         {
                             "taskId": "${construction.act.taskId}",
@@ -28,7 +28,6 @@
                             "taskDefKey": "${construction.act.taskDefKey}",
                             "procInsId": "${construction.act.procInsId}",
                             "procDefId": "${construction.act.procDefId}",
-							"fullName":"政策处理",
 							"pic":currentFileValues,
                             "flag": "yes",
                             "comment": window.encodeURI(message)
@@ -51,7 +50,6 @@
 								"taskDefKey": "${construction.act.taskDefKey}",
 								"procInsId": "${construction.act.procInsId}",
 								"procDefId": "${construction.act.procDefId}",
-								"fullName":"项目经理",
 								"flag": "no",
 								"comment": window.encodeURI(message)
 							},