Merge remote-tracking branch 'origin/master'

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

@@ -1193,6 +1193,8 @@ public class ActTaskService extends BaseService {
 			// 对不同环节的业务逻辑进行操作
 			String taskDefKey = act.getTaskDefKey();
 			// 提交流程任务
+			String processer = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:施工单位组织交底");
+			vars.put("processer", processer);
 			vars.put("pass4", true);
 			complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 		} else {

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

@@ -442,10 +442,6 @@ public class ActTaskController extends BaseController {
 	public AjaxJson artificialTask(Act act) {
 		AjaxJson j = new AjaxJson();
 		try {
-			ProcessPersonnel processPersonnel = new ProcessPersonnel();
-			processPersonnel.setProcInsId(act.getProcInsId());
-			processPersonnel.setProjectManager(UserUtils.getUser().getLoginName());
-			processPersonnelService.save(processPersonnel);
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
 			actTaskService.artificialTask(act);

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

@@ -18,7 +18,7 @@ public class Construction extends ActEntity<Construction> {
     private String projectId;		// 项目号
     private String projectName;		// 项目名称
     private Date acceptDate;		// 接收图纸时间
-    private String examineDate;		// 查看时间
+    private String examineDate;		// 备注说明
     private String powerLine;
     private String blackoutArea;
     private String projectType;

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

@@ -58,10 +58,16 @@ public class Disclose  extends ActEntity<Disclose> {
     private String needReplace;
     //设备是否有整体改造的必要
     private String overallTransformation;
+    //记录taskId
+    private String taskId;
 
+    public String getTaskId() {
+        return taskId;
+    }
 
-
-
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
 
     public String getRequireName() {
         return requireName;

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

@@ -0,0 +1,31 @@
+package com.jeeplus.modules.sg.managementcenter.activiti.entity;
+
+public class FindTask {
+    private String prInsId;
+    private String taskId;
+    private String projectName;
+
+    public String getPrInsId() {
+        return prInsId;
+    }
+
+    public void setPrInsId(String prInsId) {
+        this.prInsId = prInsId;
+    }
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+}

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

@@ -8,6 +8,7 @@ import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.test.activiti.entity.OALeave;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 施工交底MAPPER接口
@@ -35,6 +36,6 @@ public interface ConstructionMapper extends BaseMapper<Construction> {
     String demandUnit(String procInsId);
 
     //根据流程定义号查询项目需求名称
-    String idProjectName(String procInsId);
+    String idProjectName(@Param("procInsId") String procInsId);
 
 }

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

@@ -7,6 +7,9 @@ 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.activiti.entity.Disclose;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 施工交底MAPPER接口
@@ -16,5 +19,5 @@ import com.jeeplus.modules.sg.managementcenter.activiti.entity.Disclose;
 
 @MyBatisMapper
 public interface DiscloseMapper extends BaseMapper<Disclose> {
-    void newInsert(Disclose disclose);
+    int newInsert(@Param("disclose") List<Disclose> disclose);
 }

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

@@ -240,7 +240,7 @@
 	</select>
 
 
-	<insert id="newInsert">
+	<insert id="newInsert" parameterType="java.util.List">
 		replace into xm_disclose_conclusion(
 			id,
 			proc_ins_id,
@@ -278,41 +278,43 @@
 			remarks,
 			del_flag
 		) VALUES (
-			#{id},
-			#{procInsId},
-			#{conId},
-			#{requireName},
-			#{projectNumber},
-			#{projectName},
-			#{projectId},
-			#{channel},
-			#{capacity},
-			#{sceneSize},
-			#{capacitySize},
-			#{hiddenDanger},
-			#{influenceConstruction},
-			#{projectRepetition},
-			#{implemented},
-			#{transformer},
-			#{explanationOfNecessity},
-			#{lineName},
-			#{quantities},
-			#{rodNumber},
-			#{inconsistentDescription},
-			#{administrationType},
-			#{precondition},
-			#{policyHandlingInstructions},
-			#{placementMode},
-			#{productionDate},
-			#{IntegrateModule},
-			#{needReplace},
-			#{overallTransformation},
-			#{createBy.id},
-			#{createDate},
-			#{updateBy.id},
-			#{updateDate},
-			#{remarks},
-			#{delFlag}
+		<foreach collection="disclose" item="item" index="index" separator="," >
+			#{item.id},
+			#{item.procInsId},
+			#{item.conId},
+			#{item.requireName},
+			#{item.projectNumber},
+			#{item.projectName},
+			#{item.projectId},
+			#{item.channel},
+			#{item.capacity},
+			#{item.sceneSize},
+			#{item.capacitySize},
+			#{item.hiddenDanger},
+			#{item.influenceConstruction},
+			#{item.projectRepetition},
+			#{item.implemented},
+			#{item.transformer},
+			#{item.explanationOfNecessity},
+			#{item.lineName},
+			#{item.quantities},
+			#{item.rodNumber},
+			#{item.inconsistentDescription},
+			#{item.administrationType},
+			#{item.precondition},
+			#{item.policyHandlingInstructions},
+			#{item.placementMode},
+			#{item.productionDate},
+			#{item.IntegrateModule},
+			#{item.needReplace},
+			#{item.overallTransformation},
+			#{item.createBy.id},
+			#{item.createDate},
+			#{item.updateBy.id},
+			#{item.updateDate},
+			#{item.remarks},
+			#{item.delFlag}
+		</foreach>
 		)
 
 

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

@@ -84,7 +84,8 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 
 	//根据流程定义号查询项目需求名称
 	public String idProjectName(String procInsId) {
-		return constructionMapper.idProjectName(procInsId);
+		String s = constructionMapper.idProjectName(procInsId);
+		return s;
 	}
 
 }

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

@@ -55,8 +55,10 @@ public class DiscloseService extends CrudService<DiscloseMapper, Disclose> {
 	}
 
 	@Transactional(readOnly = false)
-	public void newInsert(Disclose disclose) {
-		disclose.preInsert();
-		discloseMapper.newInsert(disclose);
+	public int newInsert(List<Disclose> disclose) {
+		for (Disclose d : disclose) {
+			d.preInsert();
+		}
+		 return discloseMapper.newInsert(disclose);
 	}
 }

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

@@ -1,7 +1,11 @@
 package com.jeeplus.modules.sg.managementcenter.activiti.utils;
 
+import com.jeeplus.common.utils.SpringContextHolder;
 import com.jeeplus.common.utils.StringUtils;
+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.service.ConstructionService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import freemarker.template.Configuration;
 import org.activiti.crystalball.simulator.SimulationRunContext;
@@ -27,16 +31,17 @@ import org.activiti.engine.task.Task;
 import org.activiti.engine.task.TaskQuery;
 import org.ehcache.core.spi.service.ExecutionService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 public class MyActiviUtils {
     @Autowired
     private TaskService taskService;
     @Autowired
     private RuntimeService runtimeService;
+    @Autowired
+    private static ConstructionService constructionService = SpringContextHolder.getBean(ConstructionService.class);
     /**
      * 获取下一个用户任务信息
      * @param  taskId     任务Id信息
@@ -169,10 +174,10 @@ public class MyActiviUtils {
                 .activityName(activityName)
                 .singleResult();
         if (hais!=null) {
-            System.out.println("活动id：" + hais.getActivityId()
+/*            System.out.println("活动id：" + hais.getActivityId()
                     + "   审批人：" + hais.getAssignee()
                     + "   任务id：" + hais.getTaskId());
-            System.out.println("************************************");
+            System.out.println("************************************");*/
             j = hais.getAssignee();
         }
         return j;
@@ -181,18 +186,26 @@ public class MyActiviUtils {
     /**
      * 根据流程实例定义号节点名称登陆人查询节点
      */
-    public static MyNeedList findActivity(String activityName) {
-        List<String> proInsIdList = new ArrayList<>();
-        List<String> taskIsList = new ArrayList<>();
+    public  List<FindTask> findActivity(String activityName) {
+
         ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
-        List<Task> list = processEngine.getTaskService().createTaskQuery().taskName(activityName).list();
-        MyNeedList myNeedList = new MyNeedList();
-        for (Task a :list) {
-            proInsIdList.add(a.getProcessInstanceId());
-            taskIsList.add(a.getId());
+        List<Task> list = processEngine.getTaskService().createTaskQuery().taskName(activityName).taskAssignee(UserUtils.getUser().getLoginName()).list();
+        List<FindTask> findTaskList = new ArrayList<>();
+        FindTask findTask;
+        String s = "";
+        for (Task a : list) {
+            findTask = new FindTask();
+            String procInsId = a.getProcessInstanceId();
+            findTask.setPrInsId(procInsId);
+            findTask.setTaskId(a.getId());
+            s = constructionService.idProjectName(procInsId);
+            if (s == null || "".equals(s)) {
+                continue;
+            } else {
+                findTask.setProjectName(s);
+                findTaskList.add(findTask);
+            }
         }
-        myNeedList.setProInsIdList(proInsIdList);
-        myNeedList.setTaskIsList(taskIsList);
-        return myNeedList;
+        return findTaskList;
     }
 }

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

@@ -16,9 +16,13 @@ import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Disclose;
+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.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.DiscloseService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.UploadImagesService;
+import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
+import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyImportUtils;
 import org.activiti.engine.*;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -28,10 +32,11 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import springfox.documentation.schema.Entry;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 施工交底Controller
@@ -59,6 +64,7 @@ public class DivideController extends BaseController {
     @Autowired
     private RuntimeService runtimeService;
 
+
     @ModelAttribute
     public Construction get(@RequestParam(required = false) String id) {
         Construction entity = null;
@@ -146,7 +152,7 @@ public class DivideController extends BaseController {
     /**
      * 旧）导入交底结论，正在使用
      * */
-    @ResponseBody
+    /*@ResponseBody
     @RequestMapping(value = "importConclusion")
     public AjaxJson importConclusion(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request, String procInsId,String projectName) {
         AjaxJson j = new AjaxJson();
@@ -209,7 +215,7 @@ public class DivideController extends BaseController {
             j.setMsg("导入失败！失败信息：" + e.getMessage());
         }
         return j;
-    }
+    }*/
 
 
 
@@ -219,16 +225,101 @@ public class DivideController extends BaseController {
 //    @RequiresPermissions("modules:sg:information:information:import")
     @ResponseBody
     @RequestMapping(value = "importConclusion1")
-    public AjaxJson importConclusion1(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request, String procInsId, String projectName) {
+    public AjaxJson importConclusion1(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
         AjaxJson j = new AjaxJson();
-        ImportExcel ei = null;
+        int successNum = 0;
+        boolean flag = true;
+        String failureMsg = "";
+        //查询是当前经理负责的项目
+
+
+        //将当前经理负责的项目导入的交底结论循环
+        //做数据验证，验证成功的记录，不成功的抛出异常
+        //验证成功的list插入数据库
+        List<Disclose> discloseList = new ArrayList<>();
+        //获取当前登陆用户所有在《交底:项目经理组织交底》节点的流程
+
+        //读取文件记录在数组中
         try {
-            ei = new ImportExcel(file, 1, 0);
+            ImportExcel ei = new ImportExcel(file, 1, 0);
             int lastDataRowNum = ei.getLastDataRowNum();
+            Disclose disclose;
+            //将所有项目信息存入list
+            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.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());
+                discloseList.add(disclose);
+            }
+            //记录所有符合情况的数据
+            Map<String,Object> stringListMap = MyImportUtils.errorTips(discloseList);
+            String fin = (String)stringListMap.get("fin");
+            //所有填写标准的数据
+            List<Disclose> discloseList1 = (List<Disclose>) stringListMap.get("newDiscloseList");
+            MyActiviUtils myActiviUtils = new MyActiviUtils();
+            //所有当前用户项目经理组织交底的流程信息
+            List<FindTask> activity = myActiviUtils.findActivity("交底:项目经理组织交底");
+
+            List<Disclose> taskList = new ArrayList<>();
+            for (FindTask f : activity) {
+                String projectName = f.getProjectName();
+                for (Disclose d: discloseList1) {
+                    String requireName = d.getRequireName();
+                    if (projectName.equals(requireName)) {
+                        d.setProcInsId(f.getPrInsId());
+                        d.setTaskId(f.getTaskId());
+                        taskList.add(d);
+                    }
+                }
+            }
+            if (taskList.size() > 0) {
+                //存入数据库
+                int i = discloseService.newInsert(taskList);
+                for (Disclose d : taskList) {
+                    Map<String, Object> vars = Maps.newHashMap();
+                    String precondition = d.getPrecondition();
+                    if (precondition != null && !"".equals(precondition)) {
+                        vars.put("pass4", true);
+                        vars.put("processer", "项目经理");
+                    } else {
+                        vars.put("pass4", true);
+                        vars.put("processer", "项目经理");
+                    }
+                    actTaskService.complete(d.getTaskId(), d.getProcInsId(), "系统判断成功，请自行查看", vars);
+                }
+            }
+            j.setMsg("已成功导入 " + taskList.size() + " 记录" + fin);
         } catch (Exception e) {
             e.printStackTrace();
+            j.setSuccess(false);
+            j.setMsg("导入失败！失败信息：" + e.getMessage());
         }
-
         return j;
     }
 

src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/xml/PickIngMapper.xml

@@ -95,7 +95,7 @@
 	</update>
 
 	<select id="allVersion" resultType="string">
-		select md_version from md_module_block group by md_version;
+		select md_version from md_module_block group by md_version desc;
 	</select>
 
 	<update id="updateSelectNumber">

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

@@ -8,6 +8,10 @@
 	<%@include file="/webpage/include/summernote.jsp" %>
 	<script type="text/javascript">
 		$(document).ready(function () {
+			var a = $("#percondition").val();
+			if (a!="undefined"&&a!=null&&a!="") {
+				$("#no").css("display", "none");
+			}
 			$("#agree").click(function () {
 				var cValue ="";//定义一个数组
 				var flag1 = false;//代表是否选择了设计变更/行政政处/农村民事政处的状态，false为未选择，true为选择
@@ -106,6 +110,7 @@
 						<input id="procInsId" type="hidden" value="${fns:unescapeHtml(construction.procInsId)}">
 						<input id="projectName" type="hidden" value="${fns:unescapeHtml(construction.projectName)}">
 						<input type="hidden" value="${fns:unescapeHtml(construction.id)}">
+						<input id="percondition" type="hidden" value="${construction.disclose.precondition}">
 						<table class="table table-bordered">
 							<tbody>
 <%--							<tr>
@@ -144,10 +149,10 @@
 								<td class="width-35">
 									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
 								</td>
-								<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">
 										${fns:unescapeHtml(construction.examineDate)}
-								</td>
+								</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
@@ -363,7 +368,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-primary btn-lg btn-parsley" type="submit" value="判断没有问题" />
+									<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />
 								</div>
 							</div>
 						</div>

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

@@ -43,8 +43,7 @@
 
 
 			$("#reject").click(function () {
-				var remark = $("#remark").val();
-				var cId = $("#cId").val();
+			var cId = $("#cId").val();
 				jp.prompt("存在问题, 审批意见", function (message) {
 					jp.post("${ctx}/act/task/audit2",
 					{
@@ -55,7 +54,7 @@
 						"procDefId":"${construction.act.procDefId}",
 						"cId":cId,
 						"flag":"no",
-						"comment":window.encodeURI(remark)
+						"comment":window.encodeURI(message)
 					},
 					function (data) {
 						if(data.success){
@@ -133,10 +132,10 @@
 								<td class="width-35">
 									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
 								</td>
-								<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">
 									<input type="text" class="form-control" id="remark" name="remark" value="">
-								</td>
+								</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/divideForm.js

@@ -72,10 +72,10 @@
                 btn: ['确定', '关闭'],
                 btn1: function (index, layero) {
                     var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-                    iframeWin.contentWindow.importExcel('${ctx}/managementcenter/divide/importConclusion?projectName=' + encodeURI(encodeURI(projectName)) + '&procInsId=' + procInsId, function (data) {
+                    iframeWin.contentWindow.importExcel('${ctx}/managementcenter/divide/importConclusion1', function (data) {
                         if (data.success) {
-                            jp.success(data.msg);
-                            window.location.reload();
+                            jp.alert(data.msg);
+                            jp.go("${ctx}/act/task/todo")
                         } else {
                             jp.alert(data.msg);
                         }