bug

# Conflicts:
#	src/main/java/com/sipai/controller/equipment/MaintenancePlanController.java

pom.xml

@@ -21,6 +21,12 @@
         <!-- 数据<E695B0>?-->
     </properties>
     <dependencies>
+
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>5.4.0</version>
+        </dependency>
         <!-- spring核心<E6A0B8>?-->
         <dependency>
             <groupId>org.springframework</groupId>
@@ -781,11 +787,11 @@
             <version>1.6.1</version>
         </dependency>
         <!-- jna -->
-        <dependency>
+<!--        <dependency>-->
-            <groupId>net.java.dev.jna</groupId>
+<!--            <groupId>net.java.dev.jna</groupId>-->
-            <artifactId>jna</artifactId>
+<!--            <artifactId>jna</artifactId>-->
-            <version>1.0</version>
+<!--            <version>1.0</version>-->
-        </dependency>
+<!--        </dependency>-->
         <!-- jna examples -->
         <dependency>
             <groupId>net.java.dev.jna</groupId>
@@ -796,6 +802,14 @@
     <build>
         <finalName>TGLW</finalName>
         <resources>
+<!--            <resource>-->
+<!--                <directory>libs/win64</directory>-->
+<!--                <targetPath>win64</targetPath>-->
+<!--                <includes>-->
+<!--                    <include>*.dll</include>-->
+<!--                </includes>-->
+<!--                <filtering>false</filtering>-->
+<!--            </resource>-->
             <resource>
                 <directory>src/main/java</directory>
                 <includes>

src/main/java/com/sipai/activiti/Test.java

@@ -1,9 +0,0 @@
-package com.sipai.activiti;
-
-public class Test {
-    public static void main(String[] args) {
-        int a = 3;
-        int b = 3;
-        System.out.println(a % b);
-    }
-}

src/main/java/com/sipai/controller/activiti/ActivitiController.java

@@ -483,6 +483,7 @@ public class ActivitiController {
         String passFlag = request.getParameter("passFlag");
         if (passFlag != null && !passFlag.isEmpty()) {
             boolean pFlag = Boolean.parseBoolean(passFlag);
+            int totalCount = list.size();
             Iterator<WorkTask> iterator = list.iterator();
             while (iterator.hasNext()) {
                 WorkTask workTask = (WorkTask) iterator.next();
@@ -491,6 +492,10 @@ public class ActivitiController {
                 }
 
             }
+            // 当 passFlag=false 过滤后返回空列表（即未识别到退回路径），则作为备用方案返回全部路径
+            if (list.isEmpty() && !pFlag && totalCount > 0) {
+                list = workflowProcessDefinitionService.getNextWorkTasks(task.getProcessDefinitionId(), task.getTaskDefinitionKey());
+            }
             JSONArray jsonArray = new JSONArray();
             if (list != null && list.size() > 0) {
                 for (WorkTask workTask : list) {

src/main/java/com/sipai/controller/alarm/AlarmPointController.java

@@ -369,7 +369,9 @@ public class AlarmPointController {
                 this.mPointService.updateLalarmmin(alarmPoint.getUnitId(), mPoint.getMpointcode());
 //				mPoint.setLalarmmin(null);
             }
-//			this.mPointService.update2(alarmPoint.getUnitId(),mPoint);
+            // Enable TriggerAlarm to allow ScadaAlarmJob to process this MPoint
+            mPoint.setTriggeralarm("1");
+            this.mPointService.update2(alarmPoint.getUnitId(), mPoint);
         }
 
         if (code == Result.SUCCESS) {

src/main/java/com/sipai/controller/alarm/ProAlarmController.java

@@ -197,16 +197,15 @@ public class ProAlarmController {
 //        Iterator<String> sIterator = jsonObject.keys();
 
         JSONArray arr = new JSONArray();
-        List<XServer> allxServerList = this.xServerService.selectListByWhere(" where 1=1 ");
+//        List<XServer> allxServerList = this.xServerService.selectListByWhere(" where 1=1 ");
-        for (XServer xServer :
+//        for (XServer xServer : allxServerList) {
-                allxServerList) {
 //            if (jsonObject.get(xServer.getBizid()) != null) {
 //                String code_value = jsonObject.get(xServer.getBizid()).toString();
 //                code_value = code_value + ",data_stop_alarm";
 //                code_value = code_value.replace(",", "','");
 //                List<ProAlarm> list = this.proAlarmService.selectListByWhere(xServer.getBizid(), wherestr + " and point_code in ('" + code_value + "')"
 //                        + orderstr);
-            List<ProAlarm> list = this.proAlarmService.selectListByWhere(xServer.getBizid(), wherestr + orderstr);
+            List<ProAlarm> list = this.proAlarmService.selectListByWhere(companyId, wherestr + orderstr);
 //                System.out.println(wherestr + " and point_code in ('" + code_value + "')");
                 if (list != null && list.size() > 0) {
                     for (int i = 0; i < list.size(); i++) {
@@ -249,7 +248,7 @@ public class ProAlarmController {
                 }
 //            }
 
-        }
+//        }
         model.addAttribute("result", arr);
         return new ModelAndView("result");
     }

src/main/java/com/sipai/controller/equipment/EquipmentCardController.java

@@ -2217,12 +2217,27 @@ public class EquipmentCardController {
                                      HttpServletResponse response, Model model) throws IOException {
         String wherestr = " where 1=1 ";
         String unitId = request.getParameter("unitId");
+        if (unitId == null || unitId.isEmpty()) {
+            unitId = request.getParameter("companyId");
+        }
         String search_name = request.getParameter("search_name");
+        if (search_name == null || search_name.trim().isEmpty()) {
+            search_name = request.getParameter("equipmentName");
+        }
         String processSectionId = request.getParameter("processSectionId");
+        if (processSectionId == null || processSectionId.trim().isEmpty() || "undefined".equals(processSectionId)) {
+            processSectionId = request.getParameter("processSection");
+        }
         String equipmentClassId = request.getParameter("equipmentClassId");
+        if (equipmentClassId == null || equipmentClassId.trim().isEmpty() || "undefined".equals(equipmentClassId)) {
+            equipmentClassId = request.getParameter("search_pid1");
+        }
         String equipmentLevel = request.getParameter("equipmentLevel");
         String equipmentClassCode = request.getParameter("equipmentClassCode");//类似竹一的计量表   该页面仅显示一种设备类型的
         String ids = request.getParameter("ids");//页面勾选的设备id
+        if (ids == null || ids.trim().isEmpty()) {
+            ids = request.getParameter("equipmentIds");
+        }
 
         if (unitId != null && !unitId.isEmpty()) {
             //获取公司下所有子节点
@@ -2272,6 +2287,26 @@ public class EquipmentCardController {
 
 //        System.out.println(wherestr);
 
+        if (ids != null && !ids.trim().isEmpty()) {
+            // 兼容前端可能携带的首尾逗号与空白，确保仅导出选中设备。
+            String[] idArr = ids.split(",");
+            StringBuilder selectedIds = new StringBuilder();
+            for (String id : idArr) {
+                if (id != null) {
+                    String trimmedId = id.trim();
+                    if (!trimmedId.isEmpty()) {
+                        if (selectedIds.length() > 0) {
+                            selectedIds.append("','");
+                        }
+                        selectedIds.append(trimmedId);
+                    }
+                }
+            }
+            if (selectedIds.length() > 0) {
+                wherestr += " and id in ('" + selectedIds + "') ";
+            }
+        }
+
         List<EquipmentCard> equipmentCards = this.equipmentCardService.selectListByWhere(wherestr);
         //导出文件到指定目录,兼容Linux
         this.equipmentCardService.downloadEquipmentExcel(response, equipmentCards);

src/main/java/com/sipai/controller/equipment/MaintenancePlanController.java

@@ -37,6 +37,7 @@ import org.activiti.engine.history.HistoricTaskInstance;
 import org.activiti.engine.impl.pvm.process.ActivityImpl;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
@@ -356,7 +357,9 @@ public class MaintenancePlanController {
         model.addAttribute("nowDate", CommUtil.nowDate());
         String maintenancePlanId = pInstance.getBusinessKey();
         List<BusinessUnitAudit> list = this.businessUnitAuditService.selectListByWhere("where businessId = '" + maintenancePlanId + "' order by insdt desc ");
-        model.addAttribute("businessUnitAudit", list.get(0));
+        if (CollectionUtils.isNotEmpty(list)){
+            model.addAttribute("businessUnitAudit", list.get(0));
+        }
         MaintenancePlan maintenancePlan = this.maintenancePlanService.selectById(maintenancePlanId);
         model.addAttribute("maintenancePlan", maintenancePlan);
         EquipmentPlan equipmentPlan = this.equipmentPlanService.selectById(maintenancePlanId);

src/main/java/com/sipai/controller/kpi/KpiPlanController.java

@@ -104,7 +104,7 @@ public class KpiPlanController {
         if (StringUtils.isNotBlank(positonTypeList)) {
             wherestr += " and j.level_type = " + positonTypeList;
         }
-        wherestr += "and p.create_user_id ='" + id + "'";
+        wherestr += " and p.create_user_id ='" + id + "'";
         PageHelper.startPage(page, rows);
         List<KpiPlan> list = kpiPlanService.selectListByWhere(wherestr + orderstr);
 
@@ -387,7 +387,8 @@ public class KpiPlanController {
     @RequestMapping("/export.do")
     public void export(HttpServletRequest request, HttpServletResponse response,
                        @RequestParam(value = "periodTypeName", required = false) String periodTypeList,
-                       @RequestParam(value = "positionType", required = false) String positonTypeList) throws IOException {
+                       @RequestParam(value = "positionType", required = false) String positonTypeList,
+                       @RequestParam(value = "ids", required = false) String ids) throws IOException {
         // 摘自列表查询接口 start
         User cu = (User) request.getSession().getAttribute("cu");
         String id = cu.getId();
@@ -399,6 +400,10 @@ public class KpiPlanController {
         if (StringUtils.isNotBlank(positonTypeList) && !"null".equals(positonTypeList)) {
             wherestr += " and j.level_type = " + positonTypeList;
         }
+        if (StringUtils.isNotBlank(ids)) {
+            String idstr = ids.replace("'", "").replace(",", "','");
+            wherestr += " and p.id in ('" + idstr + "')";
+        }
         wherestr += "and p.create_user_id ='" + id + "'";
 
         List<KpiPlan> list = kpiPlanService.selectListByWhere(wherestr + orderstr);

src/main/java/com/sipai/controller/maintenance/EquipmentPlanController.java

@@ -279,10 +279,8 @@ public class EquipmentPlanController {
             if (company != null) {
                 model.addAttribute("companyName", company.getSname());
             }
-            User user = userService.getUserById(equipmentPlan.getAuditId());
+            String userNames = userService.getUserNamesByUserIds(equipmentPlan.getAuditId());
-            if (user != null) {
+            model.addAttribute("userName", userNames);
-                model.addAttribute("userName", user.getCaption());
-            }
             EquipmentPlanType equipmentPlanType_big = equipmentPlanTypeService.selectById(equipmentPlan.getPlanTypeBig());
             if (equipmentPlanType_big != null) {
                 model.addAttribute("planTypeBigName", equipmentPlanType_big.getName());
@@ -308,10 +306,8 @@ public class EquipmentPlanController {
             if (company != null) {
                 model.addAttribute("companyName", company.getSname());
             }
-            User user = userService.getUserById(equipmentPlan.getAuditId());
+            String userNames = userService.getUserNamesByUserIds(equipmentPlan.getAuditId());
-            if (user != null) {
+            model.addAttribute("userName", userNames);
-                model.addAttribute("userName", user.getCaption());
-            }
             EquipmentPlanType equipmentPlanType_big = equipmentPlanTypeService.selectById(equipmentPlan.getPlanTypeBig());
             if (equipmentPlanType_big != null) {
                 model.addAttribute("planTypeBigName", equipmentPlanType_big.getName());
@@ -422,10 +418,8 @@ public class EquipmentPlanController {
             if (company != null) {
                 model.addAttribute("companyName", company.getSname());
             }
-            User user = userService.getUserById(equipmentPlan.getAuditId());
+            String userNames = userService.getUserNamesByUserIds(equipmentPlan.getAuditId());
-            if (user != null) {
+            model.addAttribute("userName", userNames);
-                model.addAttribute("userName", user.getCaption());
-            }
             EquipmentPlanType equipmentPlanType_big = equipmentPlanTypeService.selectById(equipmentPlan.getPlanTypeBig());
             if (equipmentPlanType_big != null) {
                 model.addAttribute("planTypeBigName", equipmentPlanType_big.getName());

src/main/java/com/sipai/controller/pipeline/PipelineDataController.java

@@ -123,7 +123,9 @@ public class PipelineDataController {
     @RequestMapping("/deletes.do")
     public String dodeletes(HttpServletRequest request, Model model,
             @RequestParam(value = "ids") String ids) {
-        int result = this.pipelineDataService.deleteByWhere("where id in (" + ids + ")");
+        // 移除末尾逗号，防止SQL语法错误
+        String cleanIds = ids.replaceAll("[,\\s]+$", "").replaceAll("^[,\\s]+", "");
+        int result = this.pipelineDataService.deleteByWhere("where id in (" + cleanIds + ")");
         model.addAttribute("result", result);
         return "result";
     }

src/main/java/com/sipai/controller/report/RptCreateController.java

@@ -374,6 +374,16 @@ public class RptCreateController {
     @RequestMapping("/doadd.do")
     public String doadd(HttpServletRequest request, Model model) {
         User cu = (User) request.getSession().getAttribute("cu");
+        String rptsetId = request.getParameter("rptsetId");
+
+        // 权限验证：检查用户是否有报表生成权限
+        if (rptsetId != null && !rptsetId.isEmpty()) {
+            if (!this.rptCreateService.checkGeneratePermission(rptsetId, cu)) {
+                model.addAttribute("result", "{\"res\":\"您没有该报表的生成权限\",\"msg\":\"您没有该报表的生成权限\"}");
+                return "result";
+            }
+        }
+
         request.setAttribute("userId", cu.getId());
         request.setAttribute("userName", cu.getCaption());
         request.setAttribute("id", CommUtil.getUUID());
@@ -432,6 +442,14 @@ public class RptCreateController {
         String rptsetId = request.getParameter("rptsetId");
         int result = 0;
 
+        // 权限验证：检查用户是否有报表生成权限
+        if (rptCreate.getRptsetId() != null && !rptCreate.getRptsetId().isEmpty()) {
+            if (!this.rptCreateService.checkGeneratePermission(rptCreate.getRptsetId(), cu)) {
+                model.addAttribute("result", "{\"res\":\"您没有该报表的生成权限\",\"msg\":\"您没有该报表的生成权限\"}");
+                return new ModelAndView("result");
+            }
+        }
+
         RptInfoSet rptInfoSet = rptInfoSetService.selectById(rptCreate.getRptsetId());
         if (rptInfoSet != null) {
             //日报
@@ -545,6 +563,15 @@ public class RptCreateController {
         User cu = (User) request.getSession().getAttribute("cu");
         String rptsetId = request.getParameter("rptsetId");
         int result = 0;
+
+        // 权限验证：检查用户是否有报表生成权限
+        if (rptCreate.getRptsetId() != null && !rptCreate.getRptsetId().isEmpty()) {
+            if (!this.rptCreateService.checkGeneratePermission(rptCreate.getRptsetId(), cu)) {
+                model.addAttribute("result", "{\"res\":\"您没有该报表的生成权限\",\"msg\":\"您没有该报表的生成权限\"}");
+                return new ModelAndView("result");
+            }
+        }
+
         RptInfoSet rptInfoSet = rptInfoSetService.selectById(rptCreate.getRptsetId());
         if (rptInfoSet != null) {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -750,13 +777,26 @@ public class RptCreateController {
     @RequestMapping("/getSheet.do")
     public String getSheet(HttpServletRequest request, Model model,
                            @RequestParam(value = "id") String id) {
+        String path = "";
+        String name = "";
         Result_Report result1 = new Result_Report();
         RptCreate rptCreate = this.rptCreateService.selectById(id);
         if (rptCreate != null) {//报表生成中的预览
+            // 优先使用数据库中存储的文件路径，如果没有则构造路径（兼容旧数据）
+            if (rptCreate.getAbspath() != null && !rptCreate.getAbspath().isEmpty()) {
+                path = rptCreate.getAbspath();
+            } else {
+                path = rptCreate.getRptname() + rptCreate.getId() + ".xls";
+            }
+            // 获取文件扩展名
+            String extension = ".xls";
+            if (path.toLowerCase().endsWith(".xlsx")) {
+                extension = ".xlsx";
+            }
+            String sourcePath = rptCreate.getRptname() + extension;
             List<RptInfoSetSheet> list = rptInfoSetSheetService.selectListByWhere("where rptInfoSet_id = '" + rptCreate.getRptsetId() + "'");
             try {
-                String sourcePath = rptCreate.getRptname();
+                byte[] isb = commonFileService.getInputStreamBytes(FileNameSpaceEnum.RptCreateFile.getNameSpace(), path);
-                byte[] isb = commonFileService.getInputStreamBytes(FileNameSpaceEnum.RptCreateFile.getNameSpace(), CommUtil.fixRptCreateFileName(rptCreate.getRptname() + rptCreate.getId()));
                 if (isb == null || isb.length == 0) {
                     result1 = Result_Report.failed("文件不存在或已被删除");
                     model.addAttribute("result", CommUtil.toJson(result1));
@@ -774,7 +814,7 @@ public class RptCreateController {
                 List<RptInfoSetSheet> list = rptInfoSetSheetService.selectListByWhere("where rptInfoSet_id = '" + rptInfoSetFile.getMasterid() + "'");
                 try {
                     String sourcePath = "";
-                    String path = rptInfoSetFile.getAbspath();
+                    path = rptInfoSetFile.getAbspath();
 //                    path = path.replaceAll("\\.xlsx", "").replaceAll("\\.xls", "");
 //                    byte[] isb = commonFileService.getInputStreamBytes(FileNameSpaceEnum.RptInfoSetFile.getNameSpace(), CommUtil.fixRptCreateFileName(path));
                     byte[] isb = commonFileService.getInputStreamBytes(FileNameSpaceEnum.RptInfoSetFile.getNameSpace(), path);
@@ -850,8 +890,18 @@ public class RptCreateController {
             String name = "";
             RptCreate rptCreate = this.rptCreateService.selectById(id);
             if (rptCreate != null) {
-                path = rptCreate.getRptname() + rptCreate.getId() + ".xls";
+                // 优先使用数据库中存储的文件路径，如果没有则构造路径（兼容旧数据）
-                name = rptCreate.getRptname() + ".xls";
+                if (rptCreate.getAbspath() != null && !rptCreate.getAbspath().isEmpty()) {
+                    path = rptCreate.getAbspath();
+                } else {
+                    path = rptCreate.getRptname() + rptCreate.getId() + ".xls";
+                }
+                // 获取文件扩展名
+                String extension = ".xls";
+                if (path.toLowerCase().endsWith(".xlsx")) {
+                    extension = ".xlsx";
+                }
+                name = rptCreate.getRptname() + extension;
             }
             byte[] bytes = commonFileService.getInputStreamBytes(FileNameSpaceEnum.RptCreateFile.getNameSpace(), path);
             if (bytes == null || bytes.length == 0) {

src/main/java/com/sipai/controller/report/RptDayLogController.java

@@ -122,7 +122,14 @@ public class RptDayLogController {
 			@RequestParam(value = "rptdt") String rptdt) throws IOException {
 		User cu = (User) request.getSession().getAttribute("cu");
 		String userId = cu.getId();
-		
+
+		// 权限验证：检查用户是否有填报权限
+//		if (!this.rptDayLogService.checkInputPermission(rptdeptId, cu)) {
+//			Result result = Result.failed("您没有该报表的填报权限");
+//			model.addAttribute("result", CommUtil.toJson(result));
+//			return "result";
+//		}
+
 		JSONObject jsonObject = this.rptDayLogService.getJson(null,rptdeptId,rptdt,userId);
 
 		Result result = Result.success(jsonObject);
@@ -149,6 +156,14 @@ public class RptDayLogController {
 			@RequestParam(value = "rptdeptId") String rptdeptId) throws IOException {
 		User cu = (User) request.getSession().getAttribute("cu");
 		String userId = cu.getId();
+		
+		// 权限验证：检查用户是否有填报权限
+		if (!this.rptDayLogService.checkInputPermission(rptdeptId, cu)) {
+			Result result = Result.failed("您没有该报表的填报权限");
+			model.addAttribute("result", CommUtil.toJson(result));
+			return "result";
+		}
+		
 		JSONObject jsonObject = this.rptDayLogService.getJson(id,rptdeptId,null,userId);
 		model.addAttribute("rptDayLog", jsonObject);
 //		return "/report/reportdetail";
@@ -191,11 +206,19 @@ public class RptDayLogController {
 	}
 	
 	@RequestMapping("/dosave.do")
-	public String dosave(HttpServletRequest request,Model model){
+	public ModelAndView dosave(HttpServletRequest request,Model model){
 		User cu = (User) request.getSession().getAttribute("cu");
 		String userId = cu.getId();
 		String json = request.getParameter("json");
 		JSONObject jsonObject = JSONObject.fromObject(json);
+		
+		// 权限验证：检查用户是否有填报权限
+		String rptdeptId = (String) jsonObject.get("rptdeptId");
+		if (!this.rptDayLogService.checkInputPermission(rptdeptId, cu)) {
+			model.addAttribute("result", "{\"res\":\"您没有该报表的填报权限\",\"msg\":\"您没有该报表的填报权限\"}");
+			return new ModelAndView("result");
+		}
+		
 		if (jsonObject.get("id")==null||jsonObject.get("id").equals("")) {
 			jsonObject.put("id", CommUtil.getUUID());
 		}
@@ -206,12 +229,12 @@ public class RptDayLogController {
 			e.printStackTrace();
 			Result result = Result.failed("插入失败");
 			model.addAttribute("result", CommUtil.toJson(result));
-			return "result";
+			return new ModelAndView("result");
 		}
 		
 		Result result = Result.success(null);
 		model.addAttribute("result", CommUtil.toJson(result));
-		return "result";
+		return new ModelAndView("result");
 	}
 	
 	@RequestMapping("/onekeyAudit.do")//一键审核
@@ -228,6 +251,29 @@ public class RptDayLogController {
 	@RequestMapping("/dodeletes.do")
 	public String dodels(HttpServletRequest request,Model model,
 			@RequestParam(value="ids") String ids){
+//		User cu = (User) request.getSession().getAttribute("cu");
+//		String userId = cu.getId();
+		
+		// 获取rptdeptId，假设从参数或第一个ID推断
+//		String rptdeptId = request.getParameter("rptdeptId");
+//		if (rptdeptId == null || rptdeptId.isEmpty()) {
+//			// 如果没有提供rptdeptId，从第一个ID获取
+//			String[] idArray = ids.split(",");
+//			if (idArray.length > 0) {
+//				RptDayLog rptDayLog = this.rptDayLogService.selectById(idArray[0]);
+//				if (rptDayLog != null) {
+//					rptdeptId = rptDayLog.getRptdeptId();
+//				}
+//			}
+//		}
+		
+		// 权限验证：检查用户是否有生成权限
+//		if (!this.rptDayLogService.checkGeneratePermission(rptdeptId, cu)) {
+//			Result result = Result.failed("您没有该报表的删除权限，无法删除");// 生成权限=删除权限
+//			model.addAttribute("result", CommUtil.toJson(result));
+//			return "result";
+//		}
+		
 		String[] idArray = ids.split(",");
 		try {
 			for (int i = 0; i < idArray.length; i++) {
@@ -268,6 +314,14 @@ public class RptDayLogController {
 		@RequestParam(value = "rptdeptId", required=false) String rptdeptId) {
     	User cu = (User) request.getSession().getAttribute("cu");
 		String userId = cu.getId();
+		
+		// 权限验证：检查用户是否有填报权限
+		if (!this.rptDayLogService.checkInputPermission(rptdeptId, cu)) {
+			Result result = Result.failed("您没有该报表的填报权限");
+			model.addAttribute("result", CommUtil.toJson(result));
+			return "result";
+		}
+		
 		MultipartRequest multipartRequest = (MultipartRequest)request;
 		
 		List<MultipartFile> fileList = multipartRequest.getFiles("filelist");

src/main/java/com/sipai/controller/safety/SafetyCheckComprehensiveController.java

@@ -181,8 +181,8 @@ public class SafetyCheckComprehensiveController {
                     SafetyCheckStatusEnum.RESPONSE.getTaskTitle(),
                     bean.getDutyUserId(),  // 当前节点审批人
                     bean.getDutyUserName(),  // 当前节点审批人
-                    null, // 抄送人
+                    bean.getCopyUserId(), // 抄送人
-                    null,// 抄送人
+                    bean.getCopyUserName(),// 抄送人
                     null);
         }
         return Result.success();
@@ -377,10 +377,9 @@ public class SafetyCheckComprehensiveController {
     @Transactional(rollbackFor = Exception.class)
     public Result response(HttpServletRequest request, SafetyCheckComprehensive bean, String processInstanceId, int pass) throws IOException, ServiceException {
 
-        safetyCheckActivityService.audit(bean.getConfirmUserId(), processInstanceId, pass);
-
         //通过
         if (pass == 1) {
+            safetyCheckActivityService.audit(bean.getConfirmUserId(), processInstanceId, pass);
             bean.setStatus(SafetyCheckStatusEnum.COMPLETE.getId());
             service.update(bean);
 
@@ -403,6 +402,7 @@ public class SafetyCheckComprehensiveController {
         }
         //不通过
         else {
+            safetyCheckActivityService.audit(bean.getDutyUserId(), processInstanceId, pass);
             bean.setStatus(SafetyCheckStatusEnum.APPLY.getId());
             service.update(bean);
             safetyFlowTaskService.saveWorkFlowRecord(true,

src/main/java/com/sipai/controller/safety/SafetyCheckDaylyController.java

@@ -236,8 +236,8 @@ public class SafetyCheckDaylyController {
                     SafetyCheckStatusEnum.RESPONSE.getTaskTitle(),
                     bean.getDutyUserId(),  // 当前节点审批人
                     bean.getDutyUserName(),  // 当前节点审批人
-                    null, // 抄送人
+                    bean.getCopyUserId(), // 抄送人
-                    null,// 抄送人
+                    bean.getCopyUserName(),// 抄送人
                     null);
 
         }
@@ -373,10 +373,9 @@ public class SafetyCheckDaylyController {
     @Transactional(rollbackFor = Exception.class)
     public Result response(HttpServletRequest request, SafetyCheckDayly bean, String processInstanceId, int pass) throws IOException, ServiceException {
 
-        safetyCheckActivityService.audit(bean.getConfirmUserId(), processInstanceId, pass);
-
         //通过
         if (pass == 1) {
+            safetyCheckActivityService.audit(bean.getConfirmUserId(), processInstanceId, pass);
             bean.setStatus(SafetyCheckStatusEnum.COMPLETE.getId());
             safetyCheckDaylyService.update(bean);
 
@@ -400,6 +399,7 @@ public class SafetyCheckDaylyController {
         }
         //不通过
         else {
+            safetyCheckActivityService.audit(bean.getDutyUserId(), processInstanceId, pass);
             bean.setStatus(SafetyCheckStatusEnum.APPLY.getId());
             safetyCheckDaylyService.update(bean);
             safetyFlowTaskService.saveWorkFlowRecord(true,

src/main/java/com/sipai/controller/safety/SafetyCheckSpecialController.java

@@ -197,8 +197,8 @@ public class SafetyCheckSpecialController {
                     SafetyCheckStatusEnum.RESPONSE.getTaskTitle(),
                     bean.getDutyUserId(),  // 当前节点审批人
                     bean.getDutyUserName(),  // 当前节点审批人
-                    null, // 抄送人
+                    bean.getCopyUserId(), // 抄送人
-                    null,// 抄送人
+                    bean.getCopyUserName(),// 抄送人
                     null);
         }
         return Result.success();
@@ -393,10 +393,9 @@ public class SafetyCheckSpecialController {
     @Transactional(rollbackFor = Exception.class)
     public Result response(HttpServletRequest request, SafetyCheckSpecial bean, String processInstanceId, int pass) throws IOException, ServiceException {
 
-        safetyCheckActivityService.audit(bean.getConfirmUserId(), processInstanceId, pass);
-
         //通过
         if (pass == 1) {
+            safetyCheckActivityService.audit(bean.getConfirmUserId(), processInstanceId, pass);
             bean.setStatus(SafetyCheckStatusEnum.COMPLETE.getId());
             service.update(bean);
 
@@ -419,6 +418,7 @@ public class SafetyCheckSpecialController {
         }
         //不通过
         else {
+            safetyCheckActivityService.audit(bean.getDutyUserId(), processInstanceId, pass);
             bean.setStatus(SafetyCheckStatusEnum.APPLY.getId());
             service.update(bean);
             safetyFlowTaskService.saveWorkFlowRecord(true,

src/main/java/com/sipai/controller/safety/SafetyExternalCertificateController.java

@@ -343,8 +343,6 @@ public class SafetyExternalCertificateController {
         int result = 0;
         for (String id : ids) {
             result += service.deleteById(id);
-        }
-        for (String id : ids) {
             safetyFilesService.deleteByBizId(id);
         }
         model.addAttribute("result", result);

src/main/java/com/sipai/controller/sparepart/SewageController.java

@@ -134,6 +134,12 @@ public class SewageController {
     public String dosave(HttpServletRequest request,Model model,
     		@ModelAttribute Sewage sewage) {
     	User cu = (User) request.getSession().getAttribute("cu");
+		String contractNumber = sewage.getContractNumber() == null ? null : sewage.getContractNumber().trim();
+		sewage.setContractNumber(contractNumber);
+		if (this.sewageService.existsByContractNumber(contractNumber)) {
+			model.addAttribute("result", "{\"res\":\"合同编号已存在，不可重复\"}");
+			return "result";
+		}
     	sewage.setId(CommUtil.getUUID());
     	int result = this.sewageService.save(sewage);
     	String resultstr = "{\"res\":\""+result+"\",\"id\":\""+sewage.getId()+"\"}";
@@ -193,6 +199,12 @@ public class SewageController {
     public String doupdate(HttpServletRequest request,Model model,
     		@ModelAttribute Sewage sewage) {
     	User cu = (User) request.getSession().getAttribute("cu");
+    String contractNumber = sewage.getContractNumber() == null ? null : sewage.getContractNumber().trim();
+    sewage.setContractNumber(contractNumber);
+    if (this.sewageService.existsByContractNumberExcludeId(contractNumber, sewage.getId())) {
+      model.addAttribute("result", "{\"res\":\"合同编号已存在，不可重复\"}");
+      return "result";
+    }
     	int result = this.sewageService.update(sewage);
     	String resstr="{\"res\":\""+result+"\",\"id\":\""+sewage.getId()+"\"}";
 		model.addAttribute("result", resstr);
@@ -348,7 +360,8 @@ public class SewageController {
     @RequestMapping(value = "downloadExcelFun.do")
     public ModelAndView downloadExcelFun(HttpServletRequest request,
                                          HttpServletResponse response, Model model) throws IOException {
-        this.sewageService.outExcelFun(response);
+        String ids = request.getParameter("ids");
+        this.sewageService.outExcelFun(response, ids);
         return null;
     }
 

src/main/java/com/sipai/controller/timeefficiency/PatrolModelController.java

@@ -227,7 +227,7 @@ public class PatrolModelController {
 		User cu=(User)request.getSession().getAttribute("cu");
 		String companyId = request.getParameter("bizId");
 		String type = request.getParameter("type");
-		List<PatrolModel> list = this.patrolModelService.selectListByWhere("where unit_id = '"+companyId+"' and type='"+type+"' order by insdt");
+		List<PatrolModel> list = this.patrolModelService.selectListByWhere("where unit_id = '"+companyId+"' order by insdt");
         ArrayList<Select2> list4select2 = new ArrayList<Select2>();
         for (int i=0;i<list.size();i++){
         	Select2 select2 = new Select2();

src/main/java/com/sipai/controller/user/ProcessSectionController.java

@@ -242,10 +242,20 @@ public class ProcessSectionController {
     @RequestMapping("/getProcessSection4Select.do")
     public String getProcessSection4Select(HttpServletRequest request, Model model) {
         String companyId = request.getParameter("companyId"); // 默认查询JSBZ???
-        Company company = this.companyService.selectByPrimaryKey(companyId);
+        // companyId在不同页面可能来自tb_unit或tb_company，统一兼容两种来源
+        Unit unit = this.unitService.getUnitById(companyId);
+        String unitType = null;
+        if (unit != null) {
+            unitType = unit.getType();
+        } else if (companyId != null && !companyId.isEmpty()) {
+            Company company = this.unitService.getCompById(companyId);
+            if (company != null) {
+                unitType = company.getType();
+            }
+        }
 
         String wherestr = "where 1=1 and active='" + CommString.Active_True + "' ";
-        if (company != null && company.getType().equals(CommString.UNIT_TYPE_COMPANY)) { //  "C";//公司
+        if (CommString.UNIT_TYPE_COMPANY.equals(unitType)) { //  "C";//公司
             String bizs = "";//公司下属所有厂id
             List<Unit> blist = this.unitService.getParentCompanyChildrenBizByUnitid(companyId);
             if (blist != null && blist.size() > 0) {
@@ -257,7 +267,7 @@ public class ProcessSectionController {
             }
             bizs = bizs.replace(",", "','");
             wherestr += " and (unit_id='" + ProcessSection.UnitId_Sys + "' or (code not in (select code from tb_process_section where unit_id='" + ProcessSection.UnitId_Sys + "')) and  unit_id in ('" + bizs + "') ) ";
-        } else if (company != null && company.getType().equals(CommString.UNIT_TYPE_BIZ)) { // B 水厂
+        } else if (CommString.UNIT_TYPE_BIZ.equals(unitType)) { // B 水厂
             wherestr += " and unit_id='" + companyId + "' ";
         }
         if (request.getParameter("search_name") != null && !request.getParameter("search_name").isEmpty()) {
@@ -272,13 +282,16 @@ public class ProcessSectionController {
             for (int i = 0; i < processSections.size(); i++) {
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put("id", processSections.get(i).getCode());
-                if (company != null && company.getType().equals(CommString.UNIT_TYPE_COMPANY)) { //  "C";//公司
+                if (CommString.UNIT_TYPE_COMPANY.equals(unitType)) { //  "C";//公司
                     if (!processSections.get(i).getUnitId().equals(ProcessSection.UnitId_Sys)) {
                         jsonObject.put("text", processSections.get(i).getSname() + "(" + processSections.get(i).getCompanySname() + ")");
                     } else {
                         jsonObject.put("text", processSections.get(i).getSname());
                     }
-                } else if (company != null && company.getType().equals(CommString.UNIT_TYPE_BIZ)) { //  "B";//水厂
+                } else if (CommString.UNIT_TYPE_BIZ.equals(unitType)) { //  "B";//水厂
+                    jsonObject.put("text", processSections.get(i).getSname());
+                } else {
+                    // 兜底，避免前端下拉出现有id无text导致显示为空
                     jsonObject.put("text", processSections.get(i).getSname());
                 }
 

src/main/java/com/sipai/controller/user/RoleController.java

@@ -213,6 +213,9 @@ public class RoleController {
         JSONArray json = JSONArray.fromObject(list);
         model.addAttribute("json", json);
         model.addAttribute("roleid", roleid);
+        if(request.getParameter("bizid") != null && !request.getParameter("bizid").isEmpty()){
+            model.addAttribute("companyId", request.getParameter("bizid"));
+        }
         return "user/roleUser";
     }
 

src/main/java/com/sipai/controller/user/UserController.java

@@ -17,6 +17,7 @@ import io.swagger.annotations.*;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.activiti.engine.RepositoryService;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -852,11 +853,13 @@ public class UserController {
     public String userForSelectByCompany(HttpServletRequest request, Model model) {
         String userIds = request.getParameter("userIds");
         String jobIds = request.getParameter("jobIds");
+        String displayDept = request.getParameter("displayDept");
         if (userIds != null && !userIds.isEmpty()) {
-            List<User> list = this.userService.selectListByWhere("where id in ('" + userIds.replace(",", "','") + "') order by CHARINDEX(','+ id +',','," + userIds + ",')");
+            List<User> list = this.userService.selectListByWhere("where id in ('" + userIds.replace(",", "','") + "') order by CHARINDEX(','+ id +',',','" + userIds + ",')");
             model.addAttribute("users", JSONArray.fromObject(list));
         }
         model.addAttribute("jobIds", jobIds);
+        model.addAttribute("displayDept", displayDept);
         return "user/userForSelectByCompany";
     }
 
@@ -864,6 +867,9 @@ public class UserController {
     public String getUsersByIds(HttpServletRequest request, Model model) {
         String userIds = request.getParameter("userIds");
         List<User> list = this.userService.selectListByWhere("where id in ('" + userIds.replace(",", "','") + "') order by CHARINDEX(','+ id +',','," + userIds + ",')");
+        if (CollectionUtils.isNotEmpty(list)){
+            list = list.stream().filter(u -> StringUtils.isNotBlank(u.getId())).collect(toList());
+        }
         JSONArray json = JSONArray.fromObject(list);
         model.addAttribute("result", json);
         return "result";
@@ -1255,6 +1261,7 @@ public class UserController {
             model.addAttribute("users", JSONArray.fromObject(list));
         }
         model.addAttribute("jobIds", jobIds);
+        model.addAttribute("displayDept", request.getParameter("displayDept"));
         return "user/userForSelectByWorkOrder";
     }
 
@@ -1454,6 +1461,7 @@ public class UserController {
             model.addAttribute("users", JSONArray.fromObject(list));
         }
         model.addAttribute("jobIds", jobIds);
+        model.addAttribute("displayDept", request.getParameter("displayDept"));
         return "user/userSelectLayer";
     }
 

src/main/java/com/sipai/controller/work/KPIPointController.java

@@ -89,11 +89,26 @@ public class KPIPointController {
 //        List<MPointHistory> lists = mPointHistoryService.selectListByTableAWhere("tb_mp_11_GNJ1_F","MeasureDT='2016-01-10 10:16:57'");
 //       int dd= mPointHistoryService.deleteByTableAWhere("tb_mp_11_GNJ1_F","MeasureDT='2016-01-10 10:16:57'");
         for (int i=0; i < list.size(); i++) {
-        	ProcessSection processSection = this.processSectionService.selectById(list.get(i).getProcesssectionid());
+			String rawBizId = list.get(i).getBizid();
+			ProcessSection processSection = this.processSectionService.selectById(list.get(i).getProcesssectionid());
+			if (processSection == null && list.get(i).getProcesssectionid() != null && !list.get(i).getProcesssectionid().isEmpty()) {
+				// KPI里历史数据存在按code保存工艺段的场景，优先按厂区code匹配，再回退到系统库
+				List<ProcessSection> processSectionList = this.processSectionService.selectSimpleListByWhere(
+						"where code='" + list.get(i).getProcesssectionid() + "' and unit_id='" + rawBizId + "' "
+				);
+				if (processSectionList == null || processSectionList.isEmpty()) {
+					processSectionList = this.processSectionService.selectSimpleListByWhere(
+							"where code='" + list.get(i).getProcesssectionid() + "' and unit_id='" + ProcessSection.UnitId_Sys + "' "
+					);
+				}
+				if (processSectionList != null && !processSectionList.isEmpty()) {
+					processSection = processSectionList.get(0);
+				}
+			}
 			if (processSection != null) {
 				list.get(i).setProcessectionname(processSection.getName());
 			}
-			Company company = this.unitService.getCompById(list.get(i).getBizid());
+			Company company = this.unitService.getCompById(rawBizId);
 			if (company != null) {
 				list.get(i).setBizid(company.getName());
 			}

src/main/java/com/sipai/controller/work/MPointController.java

@@ -514,6 +514,21 @@ public class MPointController {
                     mp.setProcessSection(processSections.get(0));
                 }
             }
+            // 取redis点位数据最新值，没有就是0
+            for (MPoint mPoint : list) {
+                String id = mPoint.getId();
+                int num = mPoint.getId().hashCode() % 25;
+                RMapCache<String, String> map_redis_data = redissonClient.getMapCache(CommString.RedisMpointFlag + num);
+                if (map_redis_data.get(id) != null && !"".equals(map_redis_data.get(id))) {
+                    String[] str = map_redis_data.get(id).split(";");
+                    if (str.length >= 3 && str[1] != null && !str[1].isEmpty() && !"null".equals(str[1])) {
+                        mPoint.setParmvalue(new BigDecimal(str[1]));
+                        mPoint.setMeasuredt(str[2]);
+                    } else {
+                        mPoint.setParmvalue(BigDecimal.ZERO);
+                    }
+                }
+            }
             PageInfo<MPoint> pi = new PageInfo<MPoint>(list);
             JSONArray json = JSONArray.fromObject(list);
             result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}";
@@ -4137,8 +4152,15 @@ public class MPointController {
                 for (int i = 0; i < ids.length; i++) {
                     com.alibaba.fastjson.JSONObject jsonObject2 = new com.alibaba.fastjson.JSONObject();
 
-                    //通过es查询bizid
+                    //通过数据库查询测点（优先通过unitId和测点编码查询）
-                    MPoint mPoint_es = mPointService.selectById(ids[i]);
+                    MPoint mPoint_es = mPointService.selectById(unitId, ids[i]);
+                    if (mPoint_es == null) {
+                        // 尝试通过测点编码查询
+                        List<MPoint> mPointList = mPointService.selectListByWhere(unitId, "where mpointcode='" + ids[i] + "'");
+                        if (mPointList != null && mPointList.size() > 0) {
+                            mPoint_es = mPointList.get(0);
+                        }
+                    }
                     if (mPoint_es != null) {
                         unitId = mPoint_es.getBizid();
 

src/main/java/com/sipai/controller/work/SchedulingController.java

@@ -133,6 +133,9 @@ public class SchedulingController {
     public String doadd(HttpServletRequest request, Model model,
                         @RequestParam(value = "date") String date) {
         model.addAttribute("date", date.substring(0, 10));
+        if(request.getParameter("bizid") != null && !request.getParameter("bizid").isEmpty()){
+            model.addAttribute("bizid", request.getParameter("bizid"));
+        }
         return "work/schedulingAdd";
     }
 
@@ -142,6 +145,9 @@ public class SchedulingController {
         String wherestr = " where s.id = '" + schedulingId + "'";
         List<Scheduling> scheduling = this.schedulingService.selectCalenderListByWhere(wherestr);
         model.addAttribute("scheduling", scheduling.get(0));
+        if(request.getParameter("bizid") != null && !request.getParameter("bizid").isEmpty()){
+            model.addAttribute("bizid", request.getParameter("bizid"));
+        }
         return "work/schedulingEdit";
     }
 
@@ -475,7 +481,7 @@ public class SchedulingController {
             JSONArray array = new JSONArray();
             String[] workpeopleids = scheduling.getWorkpeople().split(",");
             if (workpeopleids != null && workpeopleids.length > 0) {
-                if (!workpeopleids[0].equals("")) {
+                if (!userId.equals(workpeopleids[0])) {
                     for (int i = 0; i < workpeopleids.length; i++) {
                         if (!userId.equals(workpeopleids[i])) {
                             JSONObject object = new JSONObject();
@@ -1150,6 +1156,10 @@ public class SchedulingController {
             }
         }
 
+        // 获取交班表单数据
+        List<GroupContentFormData> formDataList = this.groupContentFormDataService.selectListByWhere(" where schedulingId='" + schedulingId + "' ");
+        model.addAttribute("formDataList", formDataList);
+
         model.addAttribute("scheduling", scheduling);
         return "work/schedulingView";
     }

src/main/java/com/sipai/controller/workorder/WorkorderDetailController.java

@@ -1252,21 +1252,14 @@ public class WorkorderDetailController {
     @RequestMapping("/doExportRepair.do")
     public ModelAndView doExportRepair(HttpServletRequest request,
                                        HttpServletResponse response, Model model,
-                                       @RequestParam(value = "ids") String ids,
+                                       @RequestParam(value = "ids", required = false) String ids,
                                        @RequestParam(value = "type") String type) throws IOException {
-        if (ids != null && !ids.equals("")) {
+        String whereStr = buildExportWhereByIdsAndType(ids, type);
-            String[] id = ids.split(",");
+        try {
-            String workorderDetailsIds = "";
+            List<WorkorderDetail> workorderDetails = workorderDetailService.selectListByWhere(whereStr);
-            for (String s : id) {
+            this.workorderDetailService.doExportRepair(response, workorderDetails, type);
-                workorderDetailsIds += "'" + s + "',";
+        } catch (Exception e) {
-            }
+            e.printStackTrace();
-            String whereStr = "where id in (" + workorderDetailsIds.substring(0, workorderDetailsIds.length() - 1) + ")";
-            try {
-                List<WorkorderDetail> workorderDetails = workorderDetailService.selectListByWhere(whereStr);
-                this.workorderDetailService.doExportRepair(response, workorderDetails, type);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
         }
         return null;
     }
@@ -1292,21 +1285,14 @@ public class WorkorderDetailController {
     @RequestMapping("/doExportRepairJS.do")
     public ModelAndView doExportRepairJS(HttpServletRequest request,
                                          HttpServletResponse response, Model model,
-                                         @RequestParam(value = "ids") String ids,
+                                         @RequestParam(value = "ids", required = false) String ids,
                                          @RequestParam(value = "type") String type) throws IOException {
-        if (ids != null && !ids.equals("")) {
+        String whereStr = buildExportWhereByIdsAndType(ids, type);
-            String[] id = ids.split(",");
+        try {
-            String workorderDetailsIds = "";
+            List<WorkorderDetail> workorderDetails = workorderDetailService.selectListByWhere(whereStr);
-            for (String s : id) {
+            this.workorderDetailService.doExportRepairJS(response, workorderDetails, type);
-                workorderDetailsIds += "'" + s + "',";
+        } catch (Exception e) {
-            }
+            e.printStackTrace();
-            String whereStr = "where id in (" + workorderDetailsIds.substring(0, workorderDetailsIds.length() - 1) + ")";
-            try {
-                List<WorkorderDetail> workorderDetails = workorderDetailService.selectListByWhere(whereStr);
-                this.workorderDetailService.doExportRepairJS(response, workorderDetails, type);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
         }
         return null;
     }
@@ -1332,26 +1318,47 @@ public class WorkorderDetailController {
     @RequestMapping("/doExportMain.do")
     public ModelAndView doExportMain(HttpServletRequest request,
                                      HttpServletResponse response, Model model,
-                                     @RequestParam(value = "ids") String ids,
+                                     @RequestParam(value = "ids", required = false) String ids,
                                      @RequestParam(value = "type") String type) throws IOException {
-        if (ids != null && !ids.equals("")) {
+        String whereStr = buildExportWhereByIdsAndType(ids, type);
-            String[] id = ids.split(",");
+        try {
-            String workorderDetailsIds = "";
+            List<WorkorderDetail> workorderDetails = workorderDetailService.selectListByWhere(whereStr);
-            for (String s : id) {
+            this.workorderDetailService.doExportMain(response, workorderDetails, type);
-                workorderDetailsIds += "'" + s + "',";
+        } catch (Exception e) {
-            }
+            e.printStackTrace();
-            String whereStr = "where id in (" + workorderDetailsIds.substring(0, workorderDetailsIds.length() - 1) + ")";
-//            System.out.println(whereStr);
-            try {
-                List<WorkorderDetail> workorderDetails = workorderDetailService.selectListByWhere(whereStr);
-                this.workorderDetailService.doExportMain(response, workorderDetails, type);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
         }
         return null;
     }
 
+    private String buildExportWhereByIdsAndType(String ids, String type) {
+        String normalizedIds = normalizeIds(ids);
+        if (!normalizedIds.isEmpty()) {
+            String[] idArr = normalizedIds.split(",");
+            StringBuilder idBuilder = new StringBuilder();
+            for (String item : idArr) {
+                String id = item.trim();
+                if (id.isEmpty()) {
+                    continue;
+                }
+                if (idBuilder.length() > 0) {
+                    idBuilder.append(",");
+                }
+                idBuilder.append("'").append(id).append("'");
+            }
+            if (idBuilder.length() > 0) {
+                return "where id in (" + idBuilder + ")";
+            }
+        }
+        return "where type = '" + type + "'";
+    }
+
+    private String normalizeIds(String ids) {
+        if (ids == null || ids.trim().isEmpty()) {
+            return "";
+        }
+        return ids.replace("'", "").replace(" ", "").replaceAll(",+$", "");
+    }
+
     /**
      * 日历中弹出指定日期的 维修单
      *

src/main/java/com/sipai/dao/sparepart/SewageDao.java

@@ -5,6 +5,7 @@ import com.sipai.entity.sparepart.Sewage;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 @Repository
 public class SewageDao extends CommDaoImpl<Sewage> {
@@ -16,5 +17,13 @@ public class SewageDao extends CommDaoImpl<Sewage> {
         List<Sewage> list = getSqlSession().selectList(this.getMappernamespace()+"."+Thread.currentThread().getStackTrace()[1].getMethodName(), sewage);
         return list;
     }
+
+    public Integer selectCountByContractNumber(String contractNumber) {
+        return getSqlSession().selectOne(this.getMappernamespace() + "." + Thread.currentThread().getStackTrace()[1].getMethodName(), contractNumber);
+    }
+
+    public Integer selectCountByContractNumberExcludeId(Map<String, String> params) {
+        return getSqlSession().selectOne(this.getMappernamespace() + "." + Thread.currentThread().getStackTrace()[1].getMethodName(), params);
+    }
     
 }

src/main/java/com/sipai/mapper/sparepart/SewageMapper.xml

@@ -312,6 +312,17 @@
     delete from TB_Sewage_Source
     ${where}
   </delete>
+  <select id="selectCountByContractNumber" resultType="java.lang.Integer" parameterType="java.lang.String" >
+    select count(1)
+    from TB_Sewage_Source
+    where contract_number = #{contractNumber,jdbcType=VARCHAR}
+  </select>
+  <select id="selectCountByContractNumberExcludeId" resultType="java.lang.Integer" parameterType="java.util.Map" >
+    select count(1)
+    from TB_Sewage_Source
+    where contract_number = #{contractNumber,jdbcType=VARCHAR}
+    and id != #{id,jdbcType=VARCHAR}
+  </select>
   <select id="selectDistinctCityByWhere" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select Distinct [city] as [city]
     from TB_Sewage_Source

src/main/java/com/sipai/service/activiti/WorkflowProcessDefinitionService.java

@@ -362,9 +362,22 @@ public class WorkflowProcessDefinitionService {
     	String pvmTransitionId = "";
     	for (WorkTask workTask : list) {
     		PvmTransition item=this.getTransition(processDefId, taskDefId,workTask.getId(),pvmTransitionId);
+    		if (item == null) {
+    			// 未找到对应路径时默认标记为通过路径，继续处理其他任务
+    			workTask.setPassFlag(true);
+    			continue;
+    		}
     		pvmTransitionId = item.getId();
     		String conditionText=String.valueOf(item.getProperty("conditionText"));
-    		if (conditionText!=null && conditionText.contains("!"+CommString.ACTI_KEK_Condition)) {
+    		// 检测退回路径：支持多种条件表达式格式
+    		// ${!pass} / ${pass == false} / ${pass==false} / ${pass != true} / ${pass!=true}
+    		boolean isRejectPath = conditionText != null && (
+    				conditionText.contains("!"+CommString.ACTI_KEK_Condition) ||
+    				conditionText.contains(CommString.ACTI_KEK_Condition+" == false") ||
+    				conditionText.contains(CommString.ACTI_KEK_Condition+"==false") ||
+    				conditionText.contains(CommString.ACTI_KEK_Condition+" != true") ||
+    				conditionText.contains(CommString.ACTI_KEK_Condition+"!=true"));
+    		if (isRejectPath) {
     			workTask.setPassFlag(false);
             }else{
             	workTask.setPassFlag(true);

src/main/java/com/sipai/service/base/CommonFileServiceImpl.java

@@ -20,9 +20,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -351,6 +354,8 @@ public class CommonFileServiceImpl implements CommonFileService {
             String errorMsg = e.getMessage();
             if (errorMsg != null && errorMsg.contains("NoSuchKey")) {
                 logger.error("MinIO文件不存在: bucketName={}, objectName={}", nameSpace, filePath);
+            } else if (errorMsg != null && errorMsg.contains("NoSuchBucket")) {
+                logger.error("MinIO存储桶不存在: bucketName={}, objectName={}", nameSpace, filePath);
             } else {
                 logger.error("获取MinIO文件失败: bucketName={}, objectName={}, 错误: {}", nameSpace, filePath, errorMsg, e);
             }
@@ -375,12 +380,12 @@ public class CommonFileServiceImpl implements CommonFileService {
         try {
             // 安全获取文件名（自动检测编码）
             fileName = getSafeFileName(item);
-            
+
             // 生成MinIO安全的对象名称
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss");
             String timestamp = dateFormat.format(new Date());
             filePath = generateMinioObjectName(fileName, timestamp);
-            
+
             InputStream in = item.getInputStream();
             String contentType = item.getContentType();
             minioTemplate.makeBucket(nameSpace);
@@ -389,7 +394,7 @@ public class CommonFileServiceImpl implements CommonFileService {
             CommonFile commonFile = new CommonFile();
             commonFile.setId(CommUtil.getUUID());
             commonFile.setMasterid(masterId);
-            // 20210105 YYJ 用于文件表绑定资料节点用字段 tb_doc_file内和masterId一样
+            // 20210105 YYJ 用于文件表绑定<EFBFBD><EFBFBD>料节点用字段 tb_doc_file内和masterId一样
 //			commonFile.setPid(masterId);
             commonFile.setFilename(fileName);  // 保存原始文件名用于显示
             commonFile.setType(contentType);
@@ -398,6 +403,19 @@ public class CommonFileServiceImpl implements CommonFileService {
             commonFile.setAbspath(filePath);   // 保存MinIO对象名称
             commonFile.setInsdt(CommUtil.nowDate());
             commonFile.setSize((int) item.getSize());
+            // 获取当前用户ID并设置
+            try {
+                ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+                if (attributes != null) {
+                    HttpServletRequest request = attributes.getRequest();
+                    User cu = (User) request.getSession().getAttribute("cu");
+                    if (cu != null) {
+                        commonFile.setInsuser(cu.getId());
+                    }
+                }
+            } catch (Exception e) {
+                logger.warn("无法获取当前用户信息: {}", e.getMessage());
+            }
             res = this.insertByTable(tableName, commonFile);
         } catch (Exception e) {
             logger.error("Failed to update file to MinIO for masterId: {}", masterId, e);

src/main/java/com/sipai/service/business/BusinessUnitAuditService.java

@@ -112,17 +112,24 @@ public class BusinessUnitAuditService implements CommService<BusinessUnitAudit>{
                 }
 				List<HistoricActivityInstance>  list=historyService.createHistoricActivityInstanceQuery().processInstanceId(entity.getProcessid()).activityId(wortTaskId)
 						.orderByHistoricActivityInstanceStartTime().desc().list();
-				if (list != null && list.size()>0) {
+				// 优先取历史记录中的 assignee；若 assignee 为空（候选人任务未签收），则查 BusinessUnitAudit 记录获取实际提交人
-					variables.put(CommString.ACTI_KEK_Assignee, list.get(0).getAssignee());
+				String targetAssignee = null;
-					if(entity.getAuditopinion()!=null && !entity.getAuditopinion().isEmpty()){
+				if (list != null && list.size() > 0) {
-		        		taskService.addComment(entity.getTaskid(), entity.getProcessid(), entity.getAuditopinion());
+					targetAssignee = list.get(0).getAssignee();
-		        	}
-				}else {
-					variables.put(CommString.ACTI_KEK_Assignee, businessUnitAdapter.getInsuser());
-					if(entity.getAuditopinion()!=null && !entity.getAuditopinion().isEmpty()){
-		        		taskService.addComment(entity.getTaskid(), entity.getProcessid(), entity.getAuditopinion());
-		        	}
 				}
+				if (targetAssignee == null && !wortTaskId.isEmpty()) {
+					// 历史 assignee 为空时，从 BusinessUnitAudit 记录中查找该步骤的实际提交人
+					List<BusinessUnitAudit> previousAuditList = this.selectListByWhere(
+							"where businessid='" + entity.getBusinessid() + "' and taskdefinitionkey='" + wortTaskId + "' order by insdt desc");
+					if (previousAuditList != null && previousAuditList.size() > 0) {
+						targetAssignee = previousAuditList.get(0).getInsuser();
+					}
+				}
+				// 设置退回目标处理人（若仍为空则由流程变量 userIds 确定候选人，不再回退到工单创建人）
+				variables.put(CommString.ACTI_KEK_Assignee, targetAssignee);
+				if(entity.getAuditopinion()!=null && !entity.getAuditopinion().isEmpty()){
+		        	taskService.addComment(entity.getTaskid(), entity.getProcessid(), entity.getAuditopinion());
+		        }
 			}
 			//int res=0;
 	        taskService.complete(entity.getTaskid(), variables);
@@ -141,17 +148,24 @@ public class BusinessUnitAuditService implements CommService<BusinessUnitAudit>{
 				BusinessUnitRecord businessUnitRecord = new BusinessUnitRecord(entity);
 				if(entity.getPassstatus()){
 					//通过
-					if(variables.get(CommString.ACTI_KEK_Candidate_Users)!=null){
+					String candidateUsers = variables.get(CommString.ACTI_KEK_Candidate_Users) != null
-						businessUnitRecord.sendMessage(variables.get(CommString.ACTI_KEK_Candidate_Users).toString(),"");
+							? variables.get(CommString.ACTI_KEK_Candidate_Users).toString() : null;
+					if(candidateUsers != null && !candidateUsers.isEmpty()){
+						// 有下一步接收人，通知下一步处理人
+						businessUnitRecord.sendMessage(candidateUsers, "");
+					}else if(variables.get(CommString.ACTI_KEK_AssigneeList) != null){
+						// 会签
+						businessUnitRecord.sendMessage(entity.getTargetusers(), "");
 					}else{
-					    //会签
+						// 最后一步，无下一步处理人，通知当前提交人（完成确认）
-	                    if(variables.get(CommString.ACTI_KEK_AssigneeList)!=null){
+						if(entity.getInsuser() != null && !entity.getInsuser().isEmpty()){
-                        businessUnitRecord.sendMessage(entity.getTargetusers(),"");
+							businessUnitRecord.sendMessage(entity.getInsuser(), "");
-	                    }
+						}
 					}
 				}else{
-					if(variables.get(CommString.ACTI_KEK_Assignee)!=null){
+					// 退回：通知目标处理人（排除空值，避免错误发送）
-						businessUnitRecord.sendMessage(variables.get(CommString.ACTI_KEK_Assignee).toString(),"");
+					if(variables.get(CommString.ACTI_KEK_Assignee) != null){
+						businessUnitRecord.sendMessage(variables.get(CommString.ACTI_KEK_Assignee).toString(), "");
 					}
 				}
 

src/main/java/com/sipai/service/report/RptCreateService.java

@@ -2,6 +2,7 @@ package com.sipai.service.report;
 
 import com.sipai.entity.business.BusinessUnitAudit;
 import com.sipai.entity.report.RptCreate;
+import com.sipai.entity.user.User;
 import org.xmlpull.v1.XmlPullParserException;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -45,4 +46,11 @@ public interface RptCreateService {
 
     //改变状态
     public abstract int updateStatus(String id);
+
+    /** 检查用户是否有报表生成权限
+     * @param rptInfoSetId 报表配置id
+     * @param user 当前用户
+     * @return true=有权限, false=无权限
+     */
+    public abstract boolean checkGeneratePermission(String rptInfoSetId, User user);
 }

src/main/java/com/sipai/service/report/RptDayLogService.java

@@ -60,4 +60,18 @@ public interface RptDayLogService {
      * @return
      */
 	public abstract Result onekeyAudit(String ids ,User cu,String rptdeptId);
+
+	/** 检查用户是否有填报权限
+	 * @param rptdeptId 填报配置id
+	 * @param user 当前用户
+	 * @return true=有权限, false=无权限
+	 */
+	public abstract boolean checkInputPermission(String rptdeptId, User user);
+	
+	/** 检查用户是否有生成权限
+	 * @param rptdeptId 填报配置id
+	 * @param user 当前用户
+	 * @return true=有权限, false=无权限
+	 */
+	public abstract boolean checkGeneratePermission(String rptdeptId, User user);
 }

src/main/java/com/sipai/service/report/RptInfoSetService.java

@@ -71,6 +71,14 @@ public interface RptInfoSetService {
      * @return
      */
     public abstract String getRptInfoSetIds(String userId, String unitId, String type);
+    
+    /**
+     * 检查用户是否有生成权限
+     * @param rptInfoSetId 报表配置ID
+     * @param user 用户
+     * @return true=有权限, false=无权限
+     */
+    public abstract boolean checkGeneratePermission(String rptInfoSetId, com.sipai.entity.user.User user);
 
     /**
      *

src/main/java/com/sipai/service/report/impl/RptCreateServiceImpl.java

@@ -13,6 +13,7 @@ import com.sipai.entity.report.*;
 import com.sipai.entity.scada.MPoint;
 import com.sipai.entity.scada.TempReport;
 import com.sipai.entity.user.User;
+import com.sipai.entity.user.UserJob;
 import com.sipai.entity.work.GroupDetail;
 import com.sipai.entity.work.Scheduling;
 import com.sipai.service.activiti.WorkflowProcessDefinitionService;
@@ -24,6 +25,7 @@ import com.sipai.service.report.*;
 import com.sipai.service.scada.MPointService;
 import com.sipai.service.scada.TempReportService;
 import com.sipai.service.user.UserService;
+import com.sipai.service.user.UserJobService;
 import com.sipai.service.work.GroupDetailService;
 import com.sipai.service.work.SchedulingService;
 import com.sipai.tools.*;
@@ -107,6 +109,8 @@ public class RptCreateServiceImpl implements RptCreateService {
     private BusinessUnitHandleDetailService businessUnitHandleDetailService;
     @Resource
     private GroupDetailService groupDetailService;
+    @Resource
+    private UserJobService userJobService;
 
     @Override
     public RptCreate selectById(String id) {
@@ -833,6 +837,20 @@ public class RptCreateServiceImpl implements RptCreateService {
 //        System.out.println("rptdt==============================================================" + rptdt);
         String rpttype = rptInfoSet.getRpttype();//报表类型
         String bucketName = "rptinfosetfile";
+        String endtype = ".xls"; // 默认文件扩展名
+        
+        // 首先确保report bucket存在
+        try {
+            MinioClient minioClient = new MinioClient(minioProp.getEndPoint(), minioProp.getAccessKey(), minioProp.getSecretKey());
+            boolean isExist = minioClient.bucketExists("report");
+            if (!isExist) {
+                minioClient.makeBucket("report");
+                logger.info("Created MinIO bucket: report");
+            }
+        } catch (Exception e) {
+            logger.error("Failed to create report bucket", e);
+        }
+        
         List<RptInfoSetFile> filelist = this.rptInfoSetFileService.selectListByWhere(" where masterid='" + rptInfoSet.getId() + "' ");
         String path = "";
         try {
@@ -843,7 +861,11 @@ public class RptCreateServiceImpl implements RptCreateService {
                 rptInfoSetFile.setAbspath(obj);
             }
         } catch (Exception e) {
-            System.out.println(e);
+            logger.error("Failed to get template file from MinIO", e);
+        }
+        if (filelist == null || filelist.size() == 0) {
+            logger.error("No template file configured for report: {}", rptInfoSet.getId());
+            return null;
         }
         if (filelist != null && filelist.size() > 0) {
             // 设定Excel文件所在路径
@@ -854,7 +876,7 @@ public class RptCreateServiceImpl implements RptCreateService {
             byte[] bytes_m = commonFileService.getInputStreamBytes(FileNameSpaceEnum.RptInfoSetFile.getNameSpace(), path);
             // Check if bytes_m is null or empty
             if (bytes_m == null || bytes_m.length == 0) {
-                logger.error("Excel file is empty or not found: " + path);
+                logger.error("Excel template file is empty or not found: {}", path);
                 return null;
             }
             // 直接从本地文件创建Workbook, 从输入流创建Workbook
@@ -866,7 +888,8 @@ public class RptCreateServiceImpl implements RptCreateService {
                 logger.error("Failed to create workbook from file: " + path, e);
                 e.printStackTrace();
             }
-            String endtype = path.toLowerCase().endsWith(".xlsx") ? ".xlsx" : ".xls";
+            // 更新文件扩展名（根据模板文件）
+            endtype = path.toLowerCase().endsWith(".xlsx") ? ".xlsx" : ".xls";
             // 生成一个样式，用在表格数据
             CellStyle listStyle = null;
             listStyle = workbook.createCellStyle();
@@ -1374,6 +1397,10 @@ public class RptCreateServiceImpl implements RptCreateService {
                     //删除文件  只保留minio中的文件
                     File file = new File(file3);//根据指定的文件名创建File对象
                     file.delete();
+                    
+                    // 保存文件路径到数据库
+                    rptCreate.setAbspath(showname + endtype);
+                    rptCreateDao.updateByPrimaryKeySelective(rptCreate);
                 } catch (NoSuchAlgorithmException e) {
                     e.printStackTrace();
                 } catch (IOException e) {
@@ -1912,4 +1939,54 @@ public class RptCreateServiceImpl implements RptCreateService {
         return false;
     }
 
+    /**
+     * 检查用户是否有报表生成权限
+     * @param rptInfoSetId 报表配置id
+     * @param user 当前用户
+     * @return true=有权限, false=无权限
+     */
+    @Override
+    public boolean checkGeneratePermission(String rptInfoSetId, User user) {
+        if (user == null || rptInfoSetId == null || rptInfoSetId.isEmpty()) {
+            return false;
+        }
+        
+        // 管理员默认有权限
+        if ("emp01".equals(user.getId())) {
+            return true;
+        }
+        
+        // 获取报表配置信息
+        RptInfoSet rptInfoSet = rptInfoSetService.selectById4Simple(rptInfoSetId);
+        if (rptInfoSet == null) {
+            return false;
+        }
+        
+        String userId = user.getId();
+        
+        // 检查用户是否在createusers列表中
+        String createusers = rptInfoSet.getCreateusers();
+        if (createusers != null && !createusers.isEmpty()) {
+            if (createusers.contains(userId)) {
+                return true;
+            }
+        }
+        
+        // 检查用户岗位是否在generate_position列表中
+        String generatePosition = rptInfoSet.getGeneratePosition();
+        if (generatePosition != null && !generatePosition.isEmpty()) {
+            // 获取用户的所有岗位
+            List<UserJob> userJobs = userJobService.selectListByWhere(" where userid='" + userId + "'");
+            if (userJobs != null && !userJobs.isEmpty()) {
+                for (UserJob userJob : userJobs) {
+                    if (generatePosition.contains(userJob.getJobid())) {
+                        return true;
+                    }
+                }
+            }
+        }
+        
+        return false;
+    }
+
 }

src/main/java/com/sipai/service/report/impl/RptDayLogServiceImpl.java

@@ -10,16 +10,19 @@ import com.sipai.entity.scada.MPoint;
 import com.sipai.entity.scada.MPointExpand;
 import com.sipai.entity.scada.MPointHistory;
 import com.sipai.entity.user.User;
+import com.sipai.entity.user.UserJob;
 import com.sipai.service.msg.MsgService;
 import com.sipai.service.msg.MsgServiceImpl;
 import com.sipai.service.msg.MsgTypeService;
 import com.sipai.service.report.RptDayLogService;
 import com.sipai.service.report.RptDayValSetService;
 import com.sipai.service.report.RptDeptSetService;
+import com.sipai.service.report.RptInfoSetService;
 import com.sipai.service.scada.MPointExpandService;
 import com.sipai.service.scada.MPointHistoryService;
 import com.sipai.service.scada.MPointService;
 import com.sipai.service.user.UserService;
+import com.sipai.service.user.UserJobService;
 import com.sipai.tools.CommUtil;
 import com.sipai.tools.SpringContextUtil;
 import net.sf.json.JSONArray;
@@ -65,6 +68,11 @@ public class RptDayLogServiceImpl implements RptDayLogService {
     private MsgTypeService msgtypeService;
 	@Resource
 	private MPointExpandService mPointExpandService;
+	@Resource
+	private UserJobService userJobService;
+	
+	@Resource
+	private RptInfoSetService rptInfoSetService;
 	
 	@Override
 	public RptDayLog selectById(String id) {
@@ -877,5 +885,88 @@ public class RptDayLogServiceImpl implements RptDayLogService {
         Result result = Result.success(1);
         return result;
     }
-	
+
+	@Override
+	public boolean checkInputPermission(String rptdeptId, User user) {
+		if (rptdeptId == null || user == null) {
+			return false;
+		}
+		
+		RptDeptSet rptDeptSet = this.rptDeptSetService.selectById(rptdeptId);
+		if (rptDeptSet == null) {
+			return false;
+		}
+		
+		Integer roleType = rptDeptSet.getRoleType();
+		String inputuser = rptDeptSet.getInputuser();
+		String inputjob = rptDeptSet.getInputjob();
+		String userId = user.getId();
+		
+		// role_type=2: 不控制权限，所有人都可以填报
+		if (roleType != null && roleType == 2) {
+			return true;
+		}
+		
+		// role_type 为 null 或空字符串: 允许所有人
+		if (roleType == null || roleType == 0 && (inputuser == null || inputuser.isEmpty()) 
+				|| roleType == 1 && (inputjob == null || inputjob.isEmpty())) {
+			return true;
+		}
+		
+		// role_type=0: 按用户控制权限
+		if (roleType == 0) {
+			if (inputuser != null && !inputuser.isEmpty()) {
+				// 检查当前用户ID是否在inputuser中
+				String[] userIds = inputuser.split(",");
+				for (String uid : userIds) {
+					if (userId.equals(uid.trim())) {
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+		
+		// role_type=1: 按岗位控制权限
+		if (roleType == 1) {
+			if (inputjob != null && !inputjob.isEmpty()) {
+				// 获取当前用户的所有岗位
+				List<UserJob> userJobs = this.userJobService.selectListByWhere("where userid = '" + userId + "'");
+				if (userJobs != null && !userJobs.isEmpty()) {
+					String[] jobIds = inputjob.split(",");
+					for (UserJob userJob : userJobs) {
+						String userJobId = userJob.getJobid();
+						for (String jobId : jobIds) {
+							if (userJobId != null && userJobId.equals(jobId.trim())) {
+								return true;
+							}
+						}
+					}
+				}
+			}
+			return false;
+		}
+		
+		return false;
+	}
+
+	@Override
+	public boolean checkGeneratePermission(String rptdeptId, User user) {
+		if (rptdeptId == null || user == null) {
+			return false;
+		}
+		
+		RptDeptSet rptDeptSet = this.rptDeptSetService.selectById(rptdeptId);
+		if (rptDeptSet == null) {
+			return false;
+		}
+		
+		String rptInfoSetId = rptDeptSet.getBizId(); // 假设bizId是RptInfoSet的ID
+		if (rptInfoSetId == null || rptInfoSetId.isEmpty()) {
+			return false;
+		}
+		
+		return this.rptInfoSetService.checkGeneratePermission(rptInfoSetId, user);
+	}
+
 }

src/main/java/com/sipai/service/report/impl/RptInfoSetServiceImpl.java

@@ -615,4 +615,49 @@ public class RptInfoSetServiceImpl implements RptInfoSetService {
         }
         return list_result;
     }
+
+    @Override
+    public boolean checkGeneratePermission(String rptInfoSetId, User user) {
+        if (rptInfoSetId == null || user == null) {
+            return false;
+        }
+        
+        RptInfoSet rptInfoSet = this.selectById(rptInfoSetId);
+        if (rptInfoSet == null) {
+            return false;
+        }
+        
+        String userId = user.getId();
+        String createusers = rptInfoSet.getCreateusers();
+        String generatePosition = rptInfoSet.getGeneratePosition();
+        
+        // 检查createusers
+        if (createusers != null && !createusers.isEmpty()) {
+            String[] userIds = createusers.split(",");
+            for (String uid : userIds) {
+                if (userId.equals(uid.trim())) {
+                    return true;
+                }
+            }
+        }
+        
+        // 检查generatePosition
+        if (generatePosition != null && !generatePosition.isEmpty()) {
+            // 获取当前用户的所有岗位
+            List<UserJob> userJobs = userJobService.selectListByWhere("where userid = '" + userId + "'");
+            if (userJobs != null && !userJobs.isEmpty()) {
+                String[] jobIds = generatePosition.split(",");
+                for (UserJob userJob : userJobs) {
+                    String userJobId = userJob.getJobid();
+                    for (String jobId : jobIds) {
+                        if (userJobId != null && userJobId.equals(jobId.trim())) {
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+        
+        return false;
+    }
 }

src/main/java/com/sipai/service/safety/SafetyCheckActivityService.java

@@ -47,12 +47,22 @@ public class SafetyCheckActivityService {
         if (processDefinitions == null || processDefinitions.size() == 0) {
             return Result.failed(company.getName() + "缺少该流程定义。");
         }
+        // 防止重复发起：若该业务已有运行中的流程实例，则跳过，避免创建双倍待办任务
+        List<org.activiti.engine.runtime.ProcessInstance> existingInstances = workflowService.getRuntimeService()
+                .createProcessInstanceQuery()
+                .processDefinitionKey(processKey)
+                .processInstanceBusinessKey(bizId)
+                .active()
+                .list();
+        if (existingInstances != null && !existingInstances.isEmpty()) {
+            return Result.success();
+        }
         // 启动流程实例
         // 设置网关条件
         Map<String, Object> map = new HashMap<>();
         map.put(CommString.ACTI_KEK_Condition, 1);
         map.put(CommString.ACTI_KEK_Assignee, applyUserId);
-        map.put(CommString.ACTI_KEK_Candidate_Users, applyUserId);
+        map.put(CommString.ACTI_KEK_Candidate_Users, "");
 
         // 启动流程
         ProcessInstance processInstance = workflowService.startWorkflow(
@@ -71,7 +81,7 @@ public class SafetyCheckActivityService {
         Map<String, Object> map2 = new HashMap<>();
         map2.put(CommString.ACTI_KEK_Condition, 1);
         map2.put(CommString.ACTI_KEK_Assignee, nextUserId);
-        map2.put(CommString.ACTI_KEK_Candidate_Users, nextUserId);
+        map2.put(CommString.ACTI_KEK_Candidate_Users, "");
         workflowService.getTaskService().complete(task.getId(), map2);
 
         return Result.success();
@@ -91,10 +101,9 @@ public class SafetyCheckActivityService {
         Map<String, Object> map = new HashMap<>();
         map.put(CommString.ACTI_KEK_Condition, pass);
         map.put(CommString.ACTI_KEK_Assignee, nextUserId);
-        map.put(CommString.ACTI_KEK_Candidate_Users, nextUserId);
+        map.put(CommString.ACTI_KEK_Candidate_Users, "");
-        for (Task task : tasks) {
+        // 只完成第一个任务，防止多任务场景下指数级创建待办（如因重复发起导致有多个并发任务时）
-            workflowService.getTaskService().complete(task.getId(), map);
+        workflowService.getTaskService().complete(tasks.get(0).getId(), map);
-        }
         return Result.success();
     }
 

src/main/java/com/sipai/service/safety/SafetyFilesService.java

@@ -101,6 +101,9 @@ public class SafetyFilesService implements CommService<SafetyFiles> {
             MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
             List<MultipartFile> files = multipartRequest.getFiles("file");
             for (MultipartFile mfile : files) {
+                if (mfile == null || mfile.getSize() == 0) {
+                    continue;
+                }
                 String suffix = mfile.getOriginalFilename().substring(mfile.getOriginalFilename().lastIndexOf("."));
 
                 //判断保存文件的路径是否存在

src/main/java/com/sipai/service/safety/SafetyFlowTaskService.java

@@ -100,44 +100,65 @@ public class SafetyFlowTaskService implements CommService<SafetyFlowTask> {
             String copyNames,
             String record) throws ServiceException {
 
-        SafetyFlowTask safetyFlowTask;
+        SafetyFlowTask safetyFlowTask = null;
         List<SafetyFlowTask> list = selectListByWhere(" where biz_id='" + bizId + "' order by create_time desc");
-        if (list != null && list.size() != 0 && list.get(0).getTaskName().equals(taskTitle)) {
+        
-            safetyFlowTask = list.get(0);
+        // 查找是否已存在相同taskTitle的记录
-            safetyFlowTask.setIsDone(true);
+        SafetyFlowTask existingTask = null;
-            safetyFlowTask.setCopy(copyNames);
+        if (list != null && !list.isEmpty()) {
-            safetyFlowTask.setDoneTime(DateUtil.toStr(null, new Date()));
+            for (SafetyFlowTask task : list) {
-            update(safetyFlowTask);
+                if (task.getTaskName().equals(taskTitle)) {
-        } else if (list != null && list.size() != 0 && !list.get(0).getTaskName().equals(taskTitle)) {
+                    existingTask = task;
-            safetyFlowTask = list.get(0);
+                    break;
-            safetyFlowTask.setIsDone(true);
+                }
-            safetyFlowTask.setCopy(copyNames);
+            }
-            safetyFlowTask.setDoneTime(DateUtil.toStr(null, new Date()));
-            update(safetyFlowTask);
-
-            safetyFlowTask = new SafetyFlowTask();
-
-            safetyFlowTask.setId(UUID.randomUUID().toString());
-            safetyFlowTask.setBizId(bizId);
-            safetyFlowTask.setTaskName(taskTitle);
-            safetyFlowTask.setIsDone(isDone);
-            safetyFlowTask.setDoneTime(isDone ? DateUtil.toStr(null, new Date()) : null);
-            safetyFlowTask.setAuditor(auditorName);
-            safetyFlowTask.setCopy(copyNames);
-            save(safetyFlowTask);
-
-        } else {
-            safetyFlowTask = new SafetyFlowTask();
-
-            safetyFlowTask.setId(UUID.randomUUID().toString());
-            safetyFlowTask.setBizId(bizId);
-            safetyFlowTask.setTaskName(taskTitle);
-            safetyFlowTask.setIsDone(isDone);
-            safetyFlowTask.setDoneTime(isDone ? DateUtil.toStr(null, new Date()) : null);
-            safetyFlowTask.setAuditor(auditorName);
-            safetyFlowTask.setCopy(copyNames);
-            save(safetyFlowTask);
         }
+        
+        if (isDone) {
+            // 标记任务为完成
+            if (existingTask != null) {
+                // 更新已存在的记录
+                existingTask.setIsDone(true);
+                existingTask.setCopy(copyNames);
+                existingTask.setDoneTime(DateUtil.toStr(null, new Date()));
+                update(existingTask);
+                safetyFlowTask = existingTask;
+            } else {
+                // 创建新的完成记录
+                safetyFlowTask = new SafetyFlowTask();
+                safetyFlowTask.setId(UUID.randomUUID().toString());
+                safetyFlowTask.setBizId(bizId);
+                safetyFlowTask.setTaskName(taskTitle);
+                safetyFlowTask.setIsDone(true);
+                safetyFlowTask.setDoneTime(DateUtil.toStr(null, new Date()));
+                safetyFlowTask.setAuditor(auditorName);
+                safetyFlowTask.setCopy(copyNames);
+                save(safetyFlowTask);
+            }
+        } else {
+            // 创建待处理任务
+            if (existingTask == null) {
+                // 不存在才创建
+                safetyFlowTask = new SafetyFlowTask();
+                safetyFlowTask.setId(UUID.randomUUID().toString());
+                safetyFlowTask.setBizId(bizId);
+                safetyFlowTask.setTaskName(taskTitle);
+                safetyFlowTask.setIsDone(false);
+                safetyFlowTask.setDoneTime(null);
+                safetyFlowTask.setAuditor(auditorName);
+                safetyFlowTask.setCopy(copyNames);
+                save(safetyFlowTask);
+            } else {
+                // 已存在，重置为待处理状态（用于流程回退后重新处理）
+                existingTask.setIsDone(false);
+                existingTask.setDoneTime(null);
+                existingTask.setAuditor(auditorName);
+                existingTask.setCopy(copyNames);
+                update(existingTask);
+                safetyFlowTask = existingTask;
+            }
+        }
+        
         if (StringUtils.isNotEmpty(record)) {
             SafetyFlowTaskDetail safetyFlowTaskDetail = new SafetyFlowTaskDetail();
             safetyFlowTaskDetail.setId(UUID.randomUUID().toString());

src/main/java/com/sipai/service/scada/MPointService.java

@@ -1474,7 +1474,7 @@ public class MPointService {
                     if (DateUtil.isCellDateFormatted(cell)) {
                         //用于转化为日期格式
                         Date d = cell.getDateCellValue();
-                        SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+                        SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                         String cellDate = formater.format(d);
                         return cellDate;
                     } else {
@@ -1510,7 +1510,7 @@ public class MPointService {
                     if (DateUtil.isCellDateFormatted(cell)) {
                         //用于转化为日期格式
                         Date d = cell.getDateCellValue();
-                        SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+                        SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                         String cellDate = formater.format(d);
                         return cellDate;
                     } else {

src/main/java/com/sipai/service/sparepart/SewageService.java

@@ -26,24 +26,27 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static org.apache.poi.ss.usermodel.CellType.STRING;
 
 @Service
-public class SewageService implements CommService<Sewage>{
+public class SewageService implements CommService<Sewage> {
-	@Resource
+    @Resource
-	private SewageDao SewageDao;
+    private SewageDao SewageDao;
-	@Resource
+    @Resource
-	private UnitService unitService;
+    private UnitService unitService;
-	@Resource
+    @Resource
-	private CompanyService companyService;
+    private CompanyService companyService;
-	@Resource
+    @Resource
-	private ProcessSectionService processSectionService;
+    private ProcessSectionService processSectionService;
     @Resource
     private SewageInputService sewageInputService;
-    
+
     @Resource
     private JsywPointService jsywPointService;
 
@@ -62,84 +65,108 @@ public class SewageService implements CommService<Sewage>{
         }
         return null;
     }
-	
+
-	@Override
+    @Override
-	public Sewage selectById(String id) {
+    public Sewage selectById(String id) {
-		Sewage sewage = SewageDao.selectByPrimaryKey(id);
+        Sewage sewage = SewageDao.selectByPrimaryKey(id);
         sewage.setCompany(this.unitService.getCompById(sewage.getUnitId()));
         ProcessSection processSection = this.getProcessSectionByStoredValue(sewage.getProcessSectionId());
         if (processSection != null) {
             sewage.setProcessSection(processSection);
         }
-		List<SewageInput> sewageInputList = this.sewageInputService.selectListByWhere("where sewage_id='"+sewage.getContractNumber()+"' order by insdt");
+        List<SewageInput> sewageInputList = this.sewageInputService.selectListByWhere("where sewage_id='" + sewage.getContractNumber() + "' order by insdt");
-        if(sewageInputList!=null && sewageInputList.size()>0){
+        if (sewageInputList != null && sewageInputList.size() > 0) {
             sewage.set_input(true);
-        }else{
+        } else {
             sewage.set_input(false);
         }
-        List<JsywPoint> jsywPointList = this.jsywPointService.selectListByWhere("where psname='"+sewage.getName()+"' order by update_date");
+        List<JsywPoint> jsywPointList = this.jsywPointService.selectListByWhere("where psname='" + sewage.getName() + "' order by update_date");
-        if(jsywPointList!=null && jsywPointList.size()>0){
+        if (jsywPointList != null && jsywPointList.size() > 0) {
             sewage.set_point(true);
-        }else{
+        } else {
             sewage.set_point(false);
         }
-		return sewage;
+        return sewage;
-	}
+    }
-	
-	@Override
-	public int deleteById(String id) {
-		return SewageDao.deleteByPrimaryKey(id);
-	}
-	
-	@Override
-	public int save(Sewage sewage) {
-		return SewageDao.insert(sewage);
-	} 
-	
-	@Override
-	public int update(Sewage sewage) {
-		return SewageDao.updateByPrimaryKeySelective(sewage);
-	}
 
-	@Override
+    @Override
-	public List<Sewage> selectListByWhere(String wherestr) {
+    public int deleteById(String id) {
-		Sewage sewage = new Sewage();
+        return SewageDao.deleteByPrimaryKey(id);
-		sewage.setWhere(wherestr);
+    }
-		List<Sewage> list = SewageDao.selectListByWhere(sewage);
+
-		for (Sewage item : list) {
+    @Override
-			item.setCompany(this.unitService.getCompById(item.getUnitId()));
+    public int save(Sewage sewage) {
-			ProcessSection processSection = this.getProcessSectionByStoredValue(item.getProcessSectionId());
+        return SewageDao.insert(sewage);
-			if (processSection != null) {
+    }
-				item.setProcessSection(processSection);
+
-			}
+    @Override
-			List<SewageInput> sewageInputList = this.sewageInputService.selectListByWhere4Pure("where sewage_id='"+item.getContractNumber()+"' order by insdt");
+    public int update(Sewage sewage) {
-			if(sewageInputList!=null && sewageInputList.size()>0){
+        return SewageDao.updateByPrimaryKeySelective(sewage);
-			    item.set_input(true);
+    }
-			}else{
+
+    @Override
+    public List<Sewage> selectListByWhere(String wherestr) {
+        Sewage sewage = new Sewage();
+        sewage.setWhere(wherestr);
+        List<Sewage> list = SewageDao.selectListByWhere(sewage);
+        for (Sewage item : list) {
+            item.setCompany(this.unitService.getCompById(item.getUnitId()));
+            ProcessSection processSection = this.getProcessSectionByStoredValue(item.getProcessSectionId());
+            if (processSection != null) {
+                item.setProcessSection(processSection);
+            }
+            List<SewageInput> sewageInputList = this.sewageInputService.selectListByWhere4Pure("where sewage_id='" + item.getContractNumber() + "' order by insdt");
+            if (sewageInputList != null && sewageInputList.size() > 0) {
+                item.set_input(true);
+            } else {
                 item.set_input(false);
-			}
+            }
-            List<JsywPoint> jsywPointList = this.jsywPointService.selectListByWhere("where psname='"+item.getName()+"' order by update_date");
+            List<JsywPoint> jsywPointList = this.jsywPointService.selectListByWhere("where psname='" + item.getName() + "' order by update_date");
-            if(jsywPointList!=null && jsywPointList.size()>0){
+            if (jsywPointList != null && jsywPointList.size() > 0) {
                 item.set_point(true);
-            }else{
+            } else {
                 item.set_point(false);
             }
-		}
+        }
-		return list;
+        return list;
-	}
+    }
-	@Override
+
-	public int deleteByWhere(String wherestr) {
+    @Override
-		Sewage sewage = new Sewage();
+    public int deleteByWhere(String wherestr) {
-		sewage.setWhere(wherestr);
+        Sewage sewage = new Sewage();
-		return SewageDao.deleteByWhere(sewage);
+        sewage.setWhere(wherestr);
-	}
+        return SewageDao.deleteByWhere(sewage);
+    }
+
     public List<Sewage> selectDistinctCityByWhere(String wherestr) {
         Sewage sewage = new Sewage();
         sewage.setWhere(wherestr);
         List<Sewage> list = SewageDao.selectDistinctCityByWhere(sewage);
         return list;
     }
-	
+
+    public boolean existsByContractNumber(String contractNumber) {
+        if (contractNumber == null || contractNumber.trim().isEmpty()) {
+            return false;
+        }
+        Integer count = SewageDao.selectCountByContractNumber(contractNumber.trim());
+        return count != null && count > 0;
+    }
+
+    public boolean existsByContractNumberExcludeId(String contractNumber, String id) {
+        if (contractNumber == null || contractNumber.trim().isEmpty()) {
+            return false;
+        }
+        if (id == null || id.trim().isEmpty()) {
+            return existsByContractNumber(contractNumber);
+        }
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("contractNumber", contractNumber.trim());
+        params.put("id", id.trim());
+        Integer count = SewageDao.selectCountByContractNumberExcludeId(params);
+        return count != null && count > 0;
+    }
+
     /**
      * xls文件数据转换
      *
@@ -154,24 +181,26 @@ public class SewageService implements CommService<Sewage>{
                 return cell.getCellFormula();
             case NUMERIC:
 
-                    //判断是否为日期类型
+                //判断是否为日期类型
-                    if (DateUtil.isCellDateFormatted(cell)) {
+                if (DateUtil.isCellDateFormatted(cell)) {
-                        //用于转化为日期格式
+                    //用于转化为日期格式
-                        Date d = cell.getDateCellValue();
+                    Date d = cell.getDateCellValue();
-                        SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
+                    SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
-                        String cellDate = formater.format(d);
+                    String cellDate = formater.format(d);
-                        return cellDate;
+                    return cellDate;
-                    } else {
+                } else {
-                        cell.setCellType(STRING);
+                    cell.setCellType(STRING);
-                        return cell.getStringCellValue();
+                    return cell.getStringCellValue();
-                    }
+                }
 
             case STRING:
                 return cell.getStringCellValue();
             default:
                 return null;
         }
-    }    private String getBizId(String bizName) {
+    }
+
+    private String getBizId(String bizName) {
         String bizId = "";
         List<Company> CompanyList = this.companyService.selectListByWhere("where sname = '" + bizName + "' or name = '" + bizName + "' ");
         if (CompanyList != null && CompanyList.size() > 0) {
@@ -201,20 +230,20 @@ public class SewageService implements CommService<Sewage>{
                 int maxCellNum = row.getLastCellNum();//最后一列
 
                 Sewage sewage = new Sewage();
-                
+
                 HSSFCell cell = row.getCell(1);
-                if (getStringVal(cell)==null) {
+                if (getStringVal(cell) == null) {
-					continue;
+                    continue;
-				}
+                }
                 sewage.setContractNumber(getStringVal(cell));
-                
+
                 cell = row.getCell(2);
                 System.out.println(getStringVal(cell));
                 sewage.setContractOrder(Integer.parseInt(getStringVal(cell)));
-                
+
                 cell = row.getCell(3);
                 sewage.setName(getStringVal(cell));
-                
+
                 cell = row.getCell(4);
                 sewage.setAddress(getStringVal(cell));
                 cell = row.getCell(5);
@@ -224,10 +253,10 @@ public class SewageService implements CommService<Sewage>{
                 cell = row.getCell(7);
                 sewage.setPhone(getStringVal(cell));
                 cell = row.getCell(8);
-    			List<ProcessSection> processSectionList = this.processSectionService.selectListByWhere("where name = '"+getStringVal(cell)+"' and unit_id = 'JSBZ'");
+                List<ProcessSection> processSectionList = this.processSectionService.selectListByWhere("where name = '" + getStringVal(cell) + "' and unit_id = 'JSBZ'");
-    			if (processSectionList.size()>0) {
+                if (processSectionList.size() > 0) {
-                    sewage.setProcessSectionId(processSectionList.get(0)==null?"":processSectionList.get(0).getCode());
+                    sewage.setProcessSectionId(processSectionList.get(0) == null ? "" : processSectionList.get(0).getCode());
-    			}
+                }
                 cell = row.getCell(9);
                 sewage.setUnitId(this.getBizId(getStringVal(cell)));
                 cell = row.getCell(10);
@@ -241,7 +270,7 @@ public class SewageService implements CommService<Sewage>{
                 cell = row.getCell(14);
                 sewage.setPermit(getStringVal(cell));
                 cell = row.getCell(15);
-                sewage.setDisplacement(Integer.parseInt((getStringVal(cell)==null?"0":getStringVal(cell))));
+                sewage.setDisplacement(Integer.parseInt((getStringVal(cell) == null ? "0" : getStringVal(cell))));
                 cell = row.getCell(16);
                 sewage.setStandard(getStringVal(cell));
                 cell = row.getCell(17);
@@ -254,30 +283,30 @@ public class SewageService implements CommService<Sewage>{
                 sewage.setAttribute(getStringVal(cell));
                 cell = row.getCell(27);
                 sewage.setRemark(getStringVal(cell));
-                
+
 //                sewage.setVentNum(ventNum);
-                
+
                 sewage.setId(CommUtil.getUUID());
 
-                List<Sewage> selectListByWhere = this.selectListByWhere("where contract_number = '"+sewage.getContractNumber()+"'");
+                List<Sewage> selectListByWhere = this.selectListByWhere("where contract_number = '" + sewage.getContractNumber() + "'");
-                if (selectListByWhere!=null&&selectListByWhere.size()>0) {
+                if (selectListByWhere != null && selectListByWhere.size() > 0) {
-                	sewage.setId(selectListByWhere.get(0).getId());
+                    sewage.setId(selectListByWhere.get(0).getId());
-	                
+
-	                int result = this.update(sewage);
+                    int result = this.update(sewage);
-	                if (result == 1) {
+                    if (result == 1) {
-	                    sumNum++;
+                        sumNum++;
-	                } else {
+                    } else {
-	                    failNum++;
+                        failNum++;
-	                }
+                    }
-				}else {
+                } else {
-	                
+
-	                int result = this.save(sewage);
+                    int result = this.save(sewage);
-	                if (result == 1) {
+                    if (result == 1) {
-	                    sumNum++;
+                        sumNum++;
-	                } else {
+                    } else {
-	                    failNum++;
+                        failNum++;
-	                }
+                    }
-				}
+                }
 
             }
         }
@@ -293,8 +322,12 @@ public class SewageService implements CommService<Sewage>{
         return result;
     }
 
-	public void outExcelFun(HttpServletResponse response) throws IOException {
+    public void outExcelFun(HttpServletResponse response) throws IOException {
-        String fileName = "金山排海工程有限公司纳管企业表.xls";
+        outExcelFun(response, null);
+    }
+
+    public void outExcelFun(HttpServletResponse response, String ids) throws IOException {
+        String fileName = "金山卫污水厂纳管企业表.xls";
         String title = "纳管企业";
         // 声明一个工作薄
         HSSFWorkbook workbook = new HSSFWorkbook();
@@ -372,7 +405,7 @@ public class SewageService implements CommService<Sewage>{
 
         //产生表格表头
         String excelTitleStr = "序号,合同编号,合同顺序,单位名称,单位地址,合同到期日,联系人,联系电话,*所属泵站,*所属车间,排污许可证编号,雨、污水管平面图,环评报告/登记表/批复,所属行业,排水许可证（编号）复印件/申请表,实际日排量（吨/天）,排放标准（排水许可证）,管网所有权单位,统一社会信用代码,地址位置（经纬度）,接入管网坐标-经度（度）,接入管网坐标-经度（分）,接入管网坐标-经度（秒）,接入管网坐标-纬度（度）,接入管网坐标-纬度（分）,接入管网坐标-纬度（秒）,管网属性（分流/合流）,备注";
-        
+
         String[] excelTitle = excelTitleStr.split(",");
         HSSFRow row = sheet.createRow(1);
         row.setHeight((short) 800);
@@ -418,17 +451,17 @@ public class SewageService implements CommService<Sewage>{
         handRow.setHeight((short) 500);
         HSSFCell cell = handRow.createCell(0);
         cell.setCellStyle(headStyle);
-        cell.setCellValue("金山排海工程有限公司纳管企业表");
+        cell.setCellValue("金山卫污水厂纳管企业表");
         // 说明
 //        HSSFCell smcell = handRow.createCell(5);
 //        smcell.setCellStyle(tipStyle);
 //        smcell.setCellValue("注:日期格式(xxxx-xx-xx或xxxx/xx/xx), 班组类型，班组, 班次(根据系统配置名称填写)，模式（填写巡检菜单里面的巡检模式） 排版日期，班组类型，班组，班次，模式都为必填项（集控班组可不填模式）。");
 
-    	List<Sewage> list = this.selectListByWhere("where 1=1 order by contract_order asc");
+        List<Sewage> list = this.selectListByWhere(buildExportWhere(ids));
-    	int n = 1;
+        int n = 1;
         if (list != null && list.size() > 0) {
             for (int i = 0; i < list.size(); i++) {
-            	Sewage sewage = list.get(i);
+                Sewage sewage = list.get(i);
                 HSSFRow listrow1 = sheet.createRow(i + 2);
                 listrow1.setHeight((short) 400);
                 HSSFCell listcell0 = listrow1.createCell(0);
@@ -441,7 +474,7 @@ public class SewageService implements CommService<Sewage>{
 
                 HSSFCell listcell2 = listrow1.createCell(2);
                 listcell2.setCellStyle(listStyle);
-                listcell2.setCellValue(sewage.getContractOrder());
+                listcell2.setCellValue(sewage.getContractOrder() == null ? 1 : sewage.getContractOrder());
 
                 HSSFCell listcell3 = listrow1.createCell(3);
                 listcell3.setCellStyle(listStyle);
@@ -501,7 +534,7 @@ public class SewageService implements CommService<Sewage>{
 
                 HSSFCell listcell15 = listrow1.createCell(15);
                 listcell15.setCellStyle(listStyle);
-                listcell15.setCellValue((sewage.getDisplacement()==null?0:sewage.getDisplacement()));
+                listcell15.setCellValue((sewage.getDisplacement() == null ? 0 : sewage.getDisplacement()));
 
                 HSSFCell listcell16 = listrow1.createCell(16);
                 listcell16.setCellStyle(listStyle);
@@ -572,31 +605,56 @@ public class SewageService implements CommService<Sewage>{
             workbook.close();
         }
     }
-	/**
+
+    private String buildExportWhere(String ids) {
+        String orderBy = " order by contract_order asc";
+        if (ids == null || ids.trim().isEmpty()) {
+            return "where 1=1" + orderBy;
+        }
+        String[] arr = ids.split(",");
+        List<String> idList = new ArrayList<String>();
+        for (String item : arr) {
+            if (item == null) {
+                continue;
+            }
+            String id = item.trim();
+            if (!id.isEmpty() && id.matches("[A-Za-z0-9-]+")) {
+                idList.add("'" + id + "'");
+            }
+        }
+        if (idList.isEmpty()) {
+            return "where 1=1" + orderBy;
+        }
+        String idstr = String.join(",", idList);
+        return "where id in (" + idstr + ")" + orderBy;
+    }
+
+    /**
      * 获取树，三层结构，processSection为根节点，sewage为子节点
-     * @方法名:getTreeList 
+     *
-     * @参数 @param 
+     * @方法名:getTreeList
-     * @参数 @return  
+     * @参数 @param
+     * @参数 @return
      * @返回类型 String
      */
     public String getTreeList(List<Sewage> list) {
         JSONArray list_result = new JSONArray();
-        if(list!=null && list.size()>0){
+        if (list != null && list.size() > 0) {
             String processSectionId = null;
             String unitId = null;
             JSONObject root_childs = new JSONObject();
             JSONArray root_childlist = new JSONArray();
             JSONObject childs = new JSONObject();
             JSONArray childlist = new JSONArray();
-            for(int i=0;i<list.size();i++){
+            for (int i = 0; i < list.size(); i++) {
                 Sewage sewage = list.get(i);
-                if(unitId==null || unitId.isEmpty()){
+                if (unitId == null || unitId.isEmpty()) {
                     unitId = sewage.getUnitId();
                     Company company = sewage.getCompany();
-                    if(company != null){
+                    if (company != null) {
                         root_childs.put("id", company.getId());
                         root_childs.put("text", company.getName());
-                    }else{
+                    } else {
                         root_childs.put("id", unitId);
                         //没有关联Company或者unitId不存在
                         root_childs.put("text", "无区域数据");
@@ -604,8 +662,8 @@ public class SewageService implements CommService<Sewage>{
                     root_childs.put("pid", "-1");
                     root_childs.put("type", "unit");
                 }
-                if(!unitId.equals(sewage.getUnitId())){
+                if (!unitId.equals(sewage.getUnitId())) {
-                  //向当前根节点添加所有子节点
+                    //向当前根节点添加所有子节点
                     childs.put("nodes", childlist);
                     root_childlist.add(childs);
                     root_childs.put("nodes", root_childlist);
@@ -618,10 +676,10 @@ public class SewageService implements CommService<Sewage>{
                     //初始设置根节点
                     unitId = sewage.getUnitId();
                     Company company = sewage.getCompany();
-                    if(company != null){
+                    if (company != null) {
                         root_childs.put("id", company.getId());
                         root_childs.put("text", company.getName());
-                    }else{
+                    } else {
                         root_childs.put("id", unitId);
                         //没有关联Company或者unitId不存在
                         root_childs.put("text", "无区域数据");
@@ -631,15 +689,15 @@ public class SewageService implements CommService<Sewage>{
                     //初始设置根节点
                     processSectionId = null;
                 }
-                if(processSectionId==null || processSectionId.isEmpty()){
+                if (processSectionId == null || processSectionId.isEmpty()) {
                     //初始设置根节点
                     processSectionId = sewage.getProcessSectionId();
                     ProcessSection processSection = sewage.getProcessSection();
-                    if(processSection != null){
+                    if (processSection != null) {
                         childs.put("id", processSection.getCode());
                         childs.put("text", processSection.getName());
-                    }else{
+                    } else {
-                        if(processSectionId.isEmpty()){
+                        if (processSectionId.isEmpty()) {
                             processSectionId = "error";
                         }
                         childs.put("id", processSectionId);
@@ -648,9 +706,9 @@ public class SewageService implements CommService<Sewage>{
                     }
                     childs.put("pid", unitId);
                     childs.put("type", "processSection");
-                    
+
                 }
-                if(processSectionId.equals(sewage.getProcessSectionId())){
+                if (processSectionId.equals(sewage.getProcessSectionId())) {
                     //设置子节点sewage
                     JSONObject child = new JSONObject();
                     child.put("id", sewage.getId());
@@ -658,7 +716,7 @@ public class SewageService implements CommService<Sewage>{
                     child.put("pid", processSectionId);
                     child.put("type", "sewage");
                     childlist.add(child);
-                }else{
+                } else {
                     //向当前根节点添加所有子节点
                     childs.put("nodes", childlist);
                     root_childlist.add(childs);
@@ -668,11 +726,11 @@ public class SewageService implements CommService<Sewage>{
                     //初始设置根节点
                     processSectionId = sewage.getProcessSectionId();
                     ProcessSection processSection = sewage.getProcessSection();
-                    if(processSection != null){
+                    if (processSection != null) {
                         childs.put("id", processSection.getCode());
                         childs.put("text", processSection.getName());
-                    }else{
+                    } else {
-                        if(processSectionId.isEmpty()){
+                        if (processSectionId.isEmpty()) {
                             processSectionId = "error";
                         }
                         childs.put("id", processSectionId);
@@ -688,7 +746,7 @@ public class SewageService implements CommService<Sewage>{
                     child.put("type", "sewage");
                     childlist.add(child);
                 }
-                if((i+1)==list.size()){
+                if ((i + 1) == list.size()) {
                     //最后子节点结束时，向当前根节点添加所有子节点
                     childs.put("nodes", childlist);
                     root_childlist.add(childs);

src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsServiceImpl.java

@@ -132,6 +132,7 @@ public class PatrolContentsServiceImpl implements PatrolContentsService {
                         jsonObject.put("id", list3.get(j).getId());
                         jsonObject.put("name", list3.get(j).getContents());
                         jsonObject.put("text", list3.get(j).getContents());
+                        jsonObject.put("contentsDetail", list3.get(j).getContentsDetail());
                         jsonObject.put("type", TimeEfficiencyCommStr.PatrolEquipment_Equipment);
                         jsonObject.put("icon", TimeEfficiencyCommStr.PatrolContents);
                         jsonArrayEqu.add(jsonObject);

src/main/webapp/JS/activiti/workflow.js

@@ -346,6 +346,10 @@ var processSelectNodeForHandle = function(taskId){
 		//选择下一节点，先选择审核结果，再选择节点
 		$.post(ext.contextPath + "/activiti/workflow/getRoutesForSelect2.do", {taskId:taskId,passFlag:passFlag}, function(data) {
 			$("#routeNum").empty();
+			if (!data || data.length === 0) {
+				console.warn('getRoutesForSelect2: no routes found for passFlag=' + passFlag);
+				return;
+			}
 			var selelct = $("#routeNum").select2({
 				data: data,
 				placeholder:'请先选择审核结果',//默认文字提示
@@ -374,6 +378,10 @@ var processSelectNodeForHandle = function(taskId){
 	})
 	selectResult.val('').trigger("change");
 	$.post(ext.contextPath + "/activiti/workflow/getRoutesForSelect2.do", {taskId:taskId,passFlag:true}, function(data) {
+		if (!data || data.length === 0) {
+			console.warn('getRoutesForSelect2: no routes found for passFlag=true');
+			return;
+		}
 		var selelct = $("#routeNum").select2({
 			data: data,
 			placeholder:'请先选择审核结果',//默认文字提示

src/main/webapp/JS/comm.js

@@ -870,7 +870,7 @@ function openModal(modalId) {
             }
 
         }
-    })
+    });
 };
 
 /**
@@ -1060,6 +1060,12 @@ $(function () {
     });
     //FastClick.attach(document.body);
 
+    // 解决嵌套模态框中输入框无法获得焦点的问题
+    // 禁用Bootstrap模态框的enforceFocus，允许嵌套模态框中的输入框正常工作
+    if ($.fn.modal && $.fn.modal.Constructor) {
+        $.fn.modal.Constructor.prototype.enforceFocus = function() {};
+    }
+
     //弹窗关闭触发方法
     /*$(".modal").on("hidden.bs.modal", function() {
     	$('.modal').css("overflow","auto");

src/main/webapp/JS/commonFile.js

@@ -116,8 +116,11 @@ var getFileListMinioPic = function (divId, status, entityId, previews, previewCo
         tbName: tbName,
         bucketName: bucketName
     }, function (data) {
+        // 清空数组而不是重新赋值，这样可以保持引用不变
+        previews.length = 0;
+        previewConfigs.length = 0;
+        
         if (data.length > 0) {
-            previews = new Array();
             $('#maintenancefile').show();
             for (var i = 0; i < data.length; i++) {
                 var previewConfig = new Object();
@@ -133,10 +136,9 @@ var getFileListMinioPic = function (divId, status, entityId, previews, previewCo
                 }
                 previewConfigs.push(previewConfig);
             }
-            showFileInput_new(divId, previews, previewConfigs);
-        } else {
-            $('#' + divId).hide();
         }
+        // 无论是否有数据都重新初始化控件
+        showFileInput_new(divId, previews, previewConfigs);
     }, 'json');
 };
 

src/main/webapp/jsp/activiti/processInstanceList.jsp

@@ -174,7 +174,7 @@
                       page: params.offset/params.limit+1, // 每页显示数据的开始页码
                       sort: params.sort, // 要排序的字段
                       order: params.order,
-                      search_name: $('#search_name').val(),
+                    //   search_name: $('#search_name').val(),
                       search_code: $('#search_code').val()
                   }
               },
@@ -301,14 +301,14 @@
                     <label class="form-label" id="companylabel">公司</label>
                             <select class="form-control select2 "  id="search_code" name ="search_code" style="width: 220px;"></select>
                             <span class="select2-selection select2-selection--single" id="company" style="width:220px;border: none;background: transparent;" ></span>
-                        <div class="form-group pull-right" >
+                        <!-- <div class="form-group pull-right" >
                              <div class="input-group input-group-sm" style="width: 250px;">
                                <input type="text" id="search_name" name="search_name" class="form-control pull-right" placeholder="名称">
                                <div class="input-group-btn">
                                  <button  class="btn btn-default" onclick="dosearch();"><i class="fa fa-search"></i></button>
                                </div>
                             </div>
-                        </div>
+                        </div> -->
                     </div>                        
                     <table id="table"></table>
                 </div>

src/main/webapp/jsp/activiti/taskList.jsp

@@ -533,6 +533,14 @@
                   $("#subDiv").html(data);
                   openModal('subModal');
                 });
+            } else if (type.indexOf('${SAFETY_JOB_INSIDE}') != -1) {
+                $.post(ext.contextPath + '/safety/SafetyJobInside/view.do', {id: id}, function (data) {
+                  $("#subDiv").html(data);
+                  openModal('subModal');
+                });
+            }
+            else {
+                showAlert('w', `未查询到任务模块！${type}`, 'mainAlertdiv');
             }
         };
         var deleteFun = function (id) {

src/main/webapp/jsp/base/fileinputMinioPic.jsp

@@ -1,9 +1,10 @@
 <%@ page language="java" pageEncoding="UTF-8" %>
 <script type="text/javascript">
 
-    var previews = new Array();
+    // 不重新定义这些变量，直接使用主页面的全局变量
-    var previewConfigs = new Array();
+    // var previews = new Array();
-    var filelist = new Array();
+    // var previewConfigs = new Array();
+    // var filelist = new Array();
 
     //初始化fileinput控件（第一次初始化）
     function initFileInput(ctrlName, uploadUrl) {
@@ -55,9 +56,10 @@
         //导入文件上传完成之后的事件
         control.on("fileuploaded", function (event, data, previewId, index) {
             if (data.response.suc) {
-                <%--getFileListMinioPic('${param.divId}','edit');--%>
+                // 直接使用主页面的全局变量重新加载文件列表
-                // getFileListMinioPic('abnormityFileId', 'edit', '', previews, previewConfigs);
                 getFileListMinioPic('${param.divId}', 'edit', '', previews, previewConfigs);
+                // 关闭上传弹窗，返回主页面
+                closeModal('fileInputModal');
             }
         });
     }

src/main/webapp/jsp/equipment/equipmentBelongListForSelect.jsp

@@ -19,6 +19,10 @@
         }
     };
     
+    var dosearchBelong = function() {
+        $("#equipmentBelongTable").bootstrapTable('refresh');
+    };
+    
     
     //显示已经勾选的数据
     function stateFormatter(value, row, index) {  
@@ -53,6 +57,7 @@
                     page: params.offset/params.limit+1, // 每页显示数据的开始页码
                     sort: params.sort, // 要排序的字段
                     order: params.order,
+                    search_name: $('#search_belongname').val()
                 }
             },
             queryParamsType: "limit",
@@ -110,6 +115,12 @@
                 <div id="mainAlertdiv"></div>
                 <div id="menu4SelectDiv"></div> 
 				<div id="modal-body">
+                    <div class="input-group input-group-sm" style="width: 250px;float: right;margin-bottom: 15px;">
+                        <input type="text" id="search_belongname" name="search_belongname" class="form-control pull-right" placeholder="归属名称/编码">
+                        <div class="input-group-btn">
+                            <button  class="btn btn-default" onclick="dosearchBelong();"><i class="fa fa-search"></i></button>
+                        </div>
+                    </div>
                     <div class="table-scrollable">
 					   <table class="table table-bordered table-striped" style="overflow:auto;width:100%" id="equipmentBelongTable"></table>
 					</div>

src/main/webapp/jsp/equipment/equipmentCardList.jsp

@@ -141,9 +141,9 @@
                         formatter: function (value, row, index) {
                             var buts = "";
 
-                            buts += '<security:authorize buttonUrl="equipment/location.do">';
+                            // buts += '<security:authorize buttonUrl="equipment/location.do">';
-                            buts += '<button class="btn btn-default btn-sm" title="定位" onclick="locationFun(\'' + row.id + '\')"><i class="fa fa-map-marker"></i><span class="hidden-md hidden-lg"> 定位</span></button>';
+                            // buts += '<button class="btn btn-default btn-sm" title="定位" onclick="locationFun(\'' + row.id + '\')"><i class="fa fa-map-marker"></i><span class="hidden-md hidden-lg"> 定位</span></button>';
-                            buts += '</security:authorize>';
+                            // buts += '</security:authorize>';
 
                             buts += '<security:authorize buttonUrl="equipment/edit.do">';
                             buts += '<button class="btn btn-default btn-sm" title="编辑" onclick="editFun(\'' + row.id + '\')"><i class="fa fa-edit"></i><span class="hidden-md hidden-lg"> 编辑</span></button>';

src/main/webapp/jsp/equipment/equipmentCardReamrkView.jsp

@@ -105,16 +105,15 @@
             masterId: id,
             tbName: tbName
         }, function (data) {
-            //console.info(data)
+            // 清空之前的配置
+            previews = [];
+            previewConfigs = [];
             if (data.length > 0) {
-                previews = new Array();
                 $('#maintenancefile').show();
                 for (var i = 0; i < data.length; i++) {
                     var previewConfig = new Object();
-                    var path = data[i].abspath;
+                    // 预览地址：添加preview=true参数，让浏览器内嵌显示
-                    path = path.substring(path.indexOf('webapps') + 7, path.length);
+                    var path = ext.contextPath + "/report/rptInfoSetFile/downloadFile4minio.do?id=" + data[i].id + "&tbName=" + tbName + "&preview=true";
-                    path = ext.basePath.replace(ext.contextPath, '') + path.replace(/\\/g, "\/");
-                    ;
                     previews.push(path);
                     previewConfig['width'] = '2500px';
                     previewConfig['caption'] = data[i].filename;

src/main/webapp/jsp/equipment/maintenancePlanHandle.jsp

@@ -47,7 +47,7 @@
 		$("#subForm").bootstrapValidator('validate');//提交验证
 		//setTimeout(function(){
         if ($("#subForm").data('bootstrapValidator').isValid()) {//获取验证结果，如果成功，执行下面代码
-        	$.post(ext.contextPath + "/equipment/maintenancePlan/doupdate.do", $("#subForm").serialize(), function(data) {
+        	$.post(ext.contextPath + "/maintenance/equipmentPlan/doupdate.do", $("#subForm").serialize(), function(data) {
                 if (data.res == 1){
                 	$("#table").bootstrapTable('refresh');
                 	closeModal("subModal");
@@ -70,7 +70,7 @@
 		$("#subUnitForm").bootstrapValidator('validate');//提交验证
 		//setTimeout(function(){
 			if ($("#subForm").data('bootstrapValidator').isValid() && $("#subUnitForm").data('bootstrapValidator').isValid()) {//获取验证结果，如果成功，执行下面代码
-		    		$.post(ext.contextPath + "/equipment/maintenancePlan/doupdate.do", $("#subForm").serialize(), function(data) {
+		    		$.post(ext.contextPath + "/maintenance/equipmentPlan/doupdate.do", $("#subForm").serialize(), function(data) {
 		                var routeNum = $("#routeNum").val();
 		    			if (data.res == 1){
 		                	$.post(ext.contextPath + "/equipment/maintenancePlan/submitAuditAgain.do", $("#subUnitForm").serialize()+"&routeNum="+routeNum, function(unitdata) {
@@ -426,6 +426,43 @@
 					</div>
 					<div id="fileArea"></div>--%>
 				</form>
+					<!--流程审核退回后显示-->
+					<form class="form-horizontal" id="subUnitForm" enctype="multipart/form-data">
+						<input type="hidden" class="form-control" name="id" value="${businessUnitHandle.id}">
+						<input type="hidden" class="form-control" name="processid" value="${businessUnitHandle.processid}">
+						<input type="hidden" class="form-control" name="taskid" value="${businessUnitHandle.taskid}">
+						<input type="hidden" class="form-control" name="businessid" value="${businessUnitHandle.businessid}">
+						<input type="hidden" class="form-control" name="taskdefinitionkey" value="${businessUnitHandle.taskdefinitionkey}">
+						<input type="hidden" class="form-control" name="unitid" value="${businessUnitHandle.unitid}">
+						<c:if test='${not empty businessUnitAudit.auditopinion}'>
+							<div class="form-group">
+								<label class="col-sm-2 control-label">审核意见：</label>
+								<div class="col-sm-10">
+									<textarea class="form-control" id="auditopinion" name="auditopinion" rows="2" placeholder="审核意见">${businessUnitAudit.auditopinion}</textarea>
+								</div>
+							</div>
+						</c:if>
+						<div class="form-group">
+							<label class="col-sm-2 control-label">*下一节点</label>
+							<div class="col-sm-6">
+								<select class="form-control select2" id="routeNum" name="routeNum" style="width: 270px;">
+								</select>
+							</div>
+						</div>
+						<div id="selectUsers" class="form-group">
+							<label class="col-sm-2 control-label">提交至：</label>
+							<div class="col-sm-10">
+								<input type="text" class="form-control" id="targetUsersName" name="targetUsersName" placeholder="下一级人员" onclick="showUser4AuditSelectsFun();">
+								<input id="targetusers" name="targetusers" type="hidden" value="${businessUnitHandle.targetusers}"/>
+								<input class="form-control" id="targetjobs" name="targetjobs" type="hidden" value=""/>
+							</div>
+						</div>
+						<!-- 文件上传，显示 -->
+						<div class="form-group" style="margin:8px">
+							<button type="button" class="btn btn-default btn-file" onclick="fileinput_process()"><i class="fa fa-paperclip"></i>上传文件</button>
+						</div>
+						<div class="file-border" id="fileArea"></div>
+					</form>
 					<div class="box box-primary">
 					<div class="box-header with-border">
 						<h3 class="box-title">关联设备</h3>

src/main/webapp/jsp/kpi/kpiPlanList.jsp

@@ -296,7 +296,17 @@
         function exportExcel() {
             var periodTypeName = $('#periodTypeList').val();
             var positionType = $('#positionTypeList').val();
-            window.open(ext.contextPath + "/kpi/kpiPlan/export.do?periodTypeName=" + periodTypeName + "&positionType=" + positionType);
+            let checkedItems = $("#table").bootstrapTable('getSelections');
+            let ids = "";
+            $.each(checkedItems, function (index, item) {
+                ids += item.id + ",";
+            });
+            if (ids !== "") {
+                ids = ids.substring(0, ids.length - 1);
+                window.open(ext.contextPath + "/kpi/kpiPlan/export.do?periodTypeName=" + periodTypeName + "&positionType=" + positionType + "&ids=" + encodeURIComponent(ids));
+            } else {
+                window.open(ext.contextPath + "/kpi/kpiPlan/export.do?periodTypeName=" + periodTypeName + "&positionType=" + positionType);
+            }
         }
 
     </script>

src/main/webapp/jsp/login.jsp

@@ -135,7 +135,7 @@
       //配置logo
       var array = eval(${jsonArray});
       var verCode = true;
-      var bgpath = ["IMG/login/bg1.png"];
+      var bgpath = ["IMG/loginbp.png"];
         if(array!=null && array!=undefined && array.length>0){
           for(var i =0;i<array.length;i++){
             var img = null;
@@ -325,15 +325,9 @@
     <div class="content" style="height:100%;vertical-align: middle;" id="login-content">
         <!-- BEGIN 登录 FORM -->
       <form class="login-form " id="loginForm">
-        <div class="logo row">
+        <!-- <div class="logo row">
             <img  src="IMG/login/title.png" style="width:100%;" alt="" id="login-title" />
-          <!-- <div class="col-lg-8 col-sm-8 col-md-8 col-xs-8">
+        </div> -->
-            <h5 style="color:black" class="form-title">西派埃智能</h4>
-            <h2 style="margin:0px">南康智慧水厂运管平台</h2>
-            <h4 style="color:black;margin-top:4px" >精益运行工业互联网平台</h4>
-            
-          </div> -->
-        </div>
         
         <div class="form-group">
             <div id="alertDiv"></div>

src/main/webapp/jsp/main_JS_Company2_init.jsp

@@ -0,0 +1,398 @@
+<%@ page language="java" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page import="com.sipai.entity.base.ServerObject" %>
+<%@ taglib uri="http://www.springsecurity.org/jsp" prefix="security" %>
+
+<%@ page import="com.sipai.entity.base.MainConfig" %>
+<% request.setAttribute("type_pro", MainConfig.type_pro); %>
+<% request.setAttribute("type_safe", MainConfig.type_safe); %>
+<% request.setAttribute("type_eff", MainConfig.type_eff); %>
+<% request.setAttribute("type_pic", MainConfig.type_pic); %>
+
+<!DOCTYPE html>
+
+<head>
+    <title><%= ServerObject.atttable.get("TOPTITLE")%>
+    </title>
+
+    <!-- 引用页头及CSS页-->
+    <jsp:include page="/jsp/inc.jsp"></jsp:include>
+    <!-- echarts-->
+    <script type="text/javascript" src="<%=request.getContextPath()%>/plugins/echarts/echarts.4.1.0.min.js"
+            charset="utf-8"></script>
+
+    <script type="text/javascript" src="<%=request.getContextPath()%>/JS/main/main_js.js" charset="utf-8"></script>
+    <style>
+        /*
+        根据不同分辨率显示不同px的文字大小
+        */
+        @media (min-width: 1080px) {
+
+        }
+
+        @media (min-width: 1550px) {
+
+        }
+
+        .fontValue {
+            text-align: center;
+            margin-top: 20px;
+            margin-left: 70px;
+            font-size: 20px;
+            color: #ffffff;
+            font-weight: bold;
+        }
+
+        .fontText {
+            margin-left: 20px;
+            font-size: 14px;
+            color: #ffffff;
+            font-weight: bold;
+        }
+      .carousel-inner,
+      .carousel-inner >.item,
+      .carousel-inner >.item >img{
+        width:100%;height:100%;
+      }
+      .carousel-caption{
+        cursor: pointer;
+        padding: 0;
+        background-color: RGBA(55,141,204,0.5);
+        bottom: 10px;
+      }
+    </style>
+    <script type="text/javascript">
+
+
+        $(function () {
+            firstFun();
+        });
+
+        window.onresize = function () {
+            firstFun();
+        }
+
+        function firstFun() {
+            //var height = document.documentElement.clientHeight;
+            var height = $(window).height();
+            $('#mainDiv').css('height', height);//页面加载先给高度
+
+            $.ajax({
+                type: 'GET',
+                url: ext.contextPath + '/base/mainConfig/getJson.do',
+                async: true,
+                data: {unitId: unitId},
+                globle: false,
+                error: function () {
+                    return false;
+                },
+                success: function (data) {
+                    var data = eval('(' + data + ')');
+                    for (var i = 0; i < data.mpcode.length; i++) {
+                        var code = data.mpcode[i].mpointId;
+                        var funname = data.mpcode[i].funName;
+                        var divid = data.mpcode[i].divId;
+                        var testid = data.mpcode[i].testId;
+                        var mpointId = data.mpcode[i].mpointId;
+                        if (data.mpcode[i].type == '${type_pro}') {//生产
+                            eval(funname + "('" + unitId + "','" + code + "','" + divid + "','" + testid + "')")
+                        }
+                        if (data.mpcode[i].type == '${type_safe}') {//安全
+                            eval(funname + "('" + unitId + "','" + code + "','" + divid + "','" + testid + "')")
+                        }
+                        if (data.mpcode[i].type == '${type_eff}') {//效率
+                            eval(funname + "('" + unitId + "','" + code + "','" + divid + "','" + testid + "')")
+                        }
+                        if (data.mpcode[i].type == '${type_pic}') {//左上角图片
+                            //eval(funname + "('" + unitId + "')")
+                            getUnitsByUnitId4Select(unitId,funname,mpointId);
+                        }
+                    }
+                    //安全
+                    // echartColumnar2(unitId, 'TH_03_FIT040001D_FLOW_C', 'myChartsafe1');
+                }
+            });
+
+            //优良差
+            $(".evaluateIcon").attr("src", ext.contextPath + "/IMG/main/evaluate.png");
+
+            //左上角图片
+            // $("#mainImg").attr("src", ext.contextPath + "/IMG/main/main.jpg");
+
+        }
+    </script>
+
+</head>
+
+<body>
+<div id="mainDiv" style="background:#f1f1f1;">
+
+    <div style="float:left;height:100%;width:35%;">
+        <div style="float:left;height:45%;width:100%;padding:5px 5px 5px 5px;">
+            <div style="height:100%;width:100%;background-color:#ffffff;">
+                <%--图片--%>
+                <!-- <img src="" id="mainImg" style="width:100%;height:100%;"> -->
+                <div id="carousel-example-generic" class="carousel slide" data-ride="carousel" style="width:100%;height:100%;">
+                
+                  <!-- Wrapper for slides -->
+                  <div class="carousel-inner" role="listbox" id="carousel-items">
+                  </div>
+                  <!-- Controls -->
+                  <a class="left carousel-control" href="#carousel-example-generic" role="button" data-slide="prev">
+                    <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+                    <span class="sr-only">Previous</span>
+                  </a>
+                  <a class="right carousel-control" href="#carousel-example-generic" role="button" data-slide="next">
+                    <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+                    <span class="sr-only">Next</span>
+                  </a>
+                </div>
+            </div>
+        </div>
+        <div style="float:left;height:55%;width:100%;padding:5px 5px 5px 5px;">
+            <div style="height:100%;width:100%;background-color:#ffffff;">
+                <div style="width:100%;height:5%;float:left;border-bottom:2px solid #67aad7;font-weight: bold;">
+                    水量及电耗
+                </div>
+                <div style="width:100%;height:40%;float:left;">
+
+                    <div style="width:48%;height:45%;float:left;background-color:#378dcc;margin:1%;">
+                        <div class="fontValue" id="safe_value_1">-</div>
+                        <div class="fontText" id="safe_text_1">-</div>
+                    </div>
+                    <div style="width:48%;height:45%;float:right;background-color:#67aad7;margin:1%;">
+                        <div class="fontValue" id="safe_value_2">-</div>
+                        <div class="fontText" id="safe_text_2">-</div>
+                    </div>
+
+                    <div style="width:48%;height:45%;float:left;background-color:#FACA00;margin:1%;">
+                        <div class="fontValue" id="safe_value_3">-</div>
+                        <div class="fontText" id="safe_text_3">-</div>
+                    </div>
+                    <div style="width:48%;height:45%;float:right;background-color:#66D97C;margin:1%;">
+                        <div class="fontValue" id="safe_value_4">-</div>
+                        <div class="fontText" id="safe_text_4">-</div>
+                    </div>
+                </div>
+                <div style="width:100%;height:55%;float:left;padding: 5px 5px 5px 5px;">
+                    <div style="width:100%;height:100%;float:left;">
+                        <div style="width:100%;height:100%;float:left;" id="myChartProduce8"></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div style="float:left;height:100%;width:65%;">
+        <div style="float:left;height:50%;width:100%;padding:5px 5px 5px 5px;">
+            <div style="height:100%;width:100%;background-color:#ffffff;">
+                <div style="width:100%;height:5%;float:left;border-bottom:2px solid #67aad7;font-weight: bold;">
+                    一车间
+                </div>
+                <div style="width:20%;height:100%;float:left;">
+                    <div style="width:100%;height:25%;float:left;background-color:#cbe3f9;margin:6%;">
+                        <div class="fontValue" style="color: #0c4377;" id="valueProduce1_js"></div>
+                        <div class="fontText" style="color: #0c4377;" id="textProduce1_js"></div>
+                    </div>
+                    <div style="width:100%;height:25%;float:left;background-color:#badaf8;margin:6%;">
+                        <div class="fontValue" style="color: #0c4377;" id="valueProduce2_js"></div>
+                        <div class="fontText" style="color: #0c4377;" id="textProduce2_js"></div>
+                    </div>
+                    <div style="width:100%;height:25%;float:left;background-color:#73afd8;margin:6%;">
+                        <div class="fontValue" style="color: #0c4377;" id="valueProduce3_js"></div>
+                        <div class="fontText" style="color: #0c4377;" id="textProduce3_js"></div>
+                    </div>
+                </div>
+                <div style="width:80%;height:100%;float:left;padding: 5px 10px 30px 10px;">
+                    <div style="width:100%;height:100%;float:left;">
+                        <div style="width:100%;height:3%;float:left;"></div>
+                        <div style="width:100%;height:40%;float:left;">
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText1_js">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce1_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText2_js">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce2_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText3_js">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce3_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText4_js">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce4_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText5_js">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce5_js"></div>
+                            </div>
+                        </div>
+                        <div style="width:100%;height:4%;float:left;"></div>
+                        <div style="width:100%;height:40%;float:left;">
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText6_js">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce6_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText7_js">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce7_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText8_js">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce8_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText9_js">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce9_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText10_js">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce10_js"></div>
+                            </div>
+                        </div>
+                        <div style="width:100%;height:3%;float:left;"></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div style="float:left;height:50%;width:100%;padding:5px 5px 5px 5px;">
+            <div style="height:100%;width:100%;background-color:#ffffff;">
+                <div style="width:100%;height:5%;float:left;border-bottom:2px solid #67aad7;font-weight: bold;">
+                    二车间
+                </div>
+                <div style="width:20%;height:96%;float:left;">
+                    <div style="width:100%;height:25%;float:left;background-color:#cbe3f9;margin:6%;">
+                        <div class="fontValue" style="color: #0c4377;" id="valueProduce1_cs"></div>
+                        <div class="fontText" style="color: #0c4377;" id="textProduce1_cs"></div>
+                    </div>
+                    <div style="width:100%;height:25%;float:left;background-color:#badaf8;margin:6%;">
+                        <div class="fontValue" style="color: #0c4377;" id="valueProduce2_cs"></div>
+                        <div class="fontText" style="color: #0c4377;" id="textProduce2_cs"></div>
+                    </div>
+                    <div style="width:100%;height:25%;float:left;background-color:#73afd8;margin:6%;">
+                        <div class="fontValue" style="color: #0c4377;" id="valueProduce3_cs"></div>
+                        <div class="fontText" style="color: #0c4377;" id="textProduce3_cs"></div>
+                    </div>
+                </div>
+                <div style="width:80%;height:96%;float:left;padding: 5px 10px 30px 10px;">
+                    <div style="width:100%;height:100%;float:left;">
+                        <div style="width:100%;height:3%;float:left;"></div>
+                        <div style="width:100%;height:40%;float:left;">
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText1_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce1_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText2_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce2_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText3_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce3_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText4_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce4_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText5_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce5_cs"></div>
+                            </div>
+                        </div>
+                        <div style="width:100%;height:4%;float:left;"></div>
+                        <div style="width:100%;height:40%;float:left;">
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText6_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce6_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText7_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce7_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText8_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce8_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText9_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce9_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText10_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce10_cs"></div>
+                            </div>
+                        </div>
+                        <div style="width:100%;height:3%;float:left;"></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+</div>
+</body>
+
+</html>

src/main/webapp/jsp/maintenance/abnormityAdd.jsp

@@ -173,8 +173,8 @@
                     return repo.text;
                 } // 函数用于呈现当前的选择
             });
-            selelct_.val('').trigger("change");
+            selelct_.val('').trigger("change.select2");
-            selelct_.on('change', function () {
+            selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function () {
                 //工艺段选择后，清空原有工艺段选择的设备
                 $("#equipmentIds").val("");
                 $("#equipname").val("");

src/main/webapp/jsp/maintenance/abnormityEdit.jsp

@@ -159,8 +159,8 @@
                    formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果
                    formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
              });  
-            selelct_.val('${abnormity.processSectionId}').trigger("change");
+            selelct_.val('${abnormity.processSectionId}').trigger("change.select2");
-        },'json');  
+        },'json');
     };
     var companyId = "${abnormity.bizId}";
 	$(function(){
@@ -181,9 +181,9 @@
                 formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
           });  
          if(data!=null && data.length>0){
-             selelct_.val('${abnormity.processSectionId}').trigger("change");
+             selelct_.val('${abnormity.processSectionId}').trigger("change.select2");
          }
-         selelct_.on('change',function(){
+         selelct_.off("select2:select select2:clear").on("select2:select select2:clear",function(){
             //工艺段选择后，清空原有工艺段选择的设备
             $("#equipmentIds").val("");
             $("#equipname").val("");

src/main/webapp/jsp/maintenance/abnormityList.jsp

@@ -195,8 +195,8 @@
                      formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果
                      formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
                });  
-              selelct_.val('').trigger("change");
+              selelct_.val('').trigger("change.select2");
-              selelct_.on("change",function(e){
+              selelct_.off("select2:select select2:clear").on("select2:select select2:clear",function(e){
                   dosearch();
               });
         },'json'); 

src/main/webapp/jsp/maintenance/abnormityList_new.jsp

@@ -156,8 +156,8 @@
                             return repo.text;
                         } // 函数用于呈现当前的选择
                     });
-                    selelct_.val('').trigger("change");
+                    selelct_.val('').trigger("change.select2");
-                    selelct_.on("change", function (e) {
+                    selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) {
                         initAPPFun();
                     });
                 }, 'json');
@@ -493,8 +493,8 @@
                         return repo.text;
                     } // 函数用于呈现当前的选择
                 });
-                selelct_.val('').trigger("change");
+                selelct_.val('').trigger("change.select2");
-                selelct_.on("change", function (e) {
+                selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) {
                     // dosearch();
                     $("#table").bootstrapTable('refresh');
                 });

src/main/webapp/jsp/maintenance/anticorrosiveLibraryList.jsp

@@ -170,16 +170,16 @@
                         return repo.text;
                     } // 函数用于呈现当前的选择
                 });
-                selelct_.val('').trigger("change");
+                selelct_.val('').trigger("change.select2");
-                selelct_.on("change", function (e) {
+                selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) {
                     dosearch();
                 });
             }, 'json');
             var statusSelect = $("#statusSelect").select2({
                 minimumResultsForSearch: 10,
                 placeholder: '请选择',
-            }).val('').trigger("change");
+            }).val('').trigger("change.select2");
-            statusSelect.on("change", function (e) {
+            statusSelect.off("select2:select select2:clear").on("select2:select select2:clear", function (e) {
                 dosearch();
             });
             $("#table").bootstrapTable({ // 对应table标签的id

src/main/webapp/jsp/maintenance/defectEndRecordList.jsp

@@ -174,8 +174,8 @@
                         return repo.text;
                     } // 函数用于呈现当前的选择
                 });
-                selelct_.val("").trigger("change");
+                selelct_.val("").trigger("change.select2");
-                selelct_.on("change", function (e) {
+                selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) {
                     dosearch();
                 });
             }, 'json');

src/main/webapp/jsp/maintenance/defectRecordAdd.jsp

@@ -354,7 +354,7 @@
                     </div>--%>
 
                     <div class="form-group" style="margin:8px">
-                        <button type="button" class="btn btn-default btn-file" onclick="fileinputPic('maintenanceDetailFile')"
+                        <button type="button" class="btn btn-default btn-file" onclick="fileinputPic('abnormityFileId')"
                                 id="btn_save"><i
                                 class="fa fa-paperclip"></i>上传图片
                         </button>

src/main/webapp/jsp/maintenance/defectRecordList.jsp

@@ -187,8 +187,8 @@
                         return repo.text;
                     } // 函数用于呈现当前的选择
                 });
-                selelct_.val("").trigger("change");
+                selelct_.val("").trigger("change.select2");
-                selelct_.on("change", function (e) {
+                selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) {
                     dosearch();
                 });
             }, 'json');

src/main/webapp/jsp/maintenance/maintenanceDetailList.jsp

@@ -271,8 +271,8 @@
           formatResult: function formatRepo(repo) { return repo.text; }, // 函数用来渲染结果
           formatSelection: function formatRepoSelection(repo) { return repo.text; } // 函数用于呈现当前的选择
         });
-        selelct_.val("").trigger("change");
+        selelct_.val("").trigger("change.select2");
-        selelct_.on("change", function (e) {
+        selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) {
           dosearch();
         });
       }, 'json');

src/main/webapp/jsp/pipeline/pipelineDataList.jsp

@@ -88,7 +88,10 @@
         var checkedItems = $("#table").bootstrapTable('getSelections');
         var datas = "";
         $.each(checkedItems, function(index, item) {
-            datas += item.id + ",";
+            if (datas != "") {
+                datas += ",";
+            }
+            datas += item.id;
         });
         if (datas == "") {
             showAlert('d', '请先选择记录', 'mainAlertdiv');

src/main/webapp/jsp/report/rptDayLogList.jsp

@@ -78,8 +78,11 @@
             rptdt: time,
             rptdeptId: '${param.rptdeptId}'
         }, function (data) {
-            $("#rptDiv").html(data);
+            if (data.code > 0) {
-            openModal('subModal');
+            $("#rptDiv").html(data); openModal('subModal');
+            } else {
+                showAlert('d', '您没有该报表的填报权限', 'mainAlertdiv');
+            }
         });
     };
 
@@ -160,7 +163,7 @@
                             if (data.code > 0) {
                                 $("#table").bootstrapTable('refresh');
                             } else {
-                                showAlert('d', '删除失败', 'mainAlertdiv');
+                                showAlert('d', data.msg, 'mainAlertdiv');
                             }
                         }, 'json');
 

src/main/webapp/jsp/safety/EducationBuilderList.jsp

@@ -263,7 +263,8 @@
                         field: 'name', // 返回json数据中的name
                         title: '姓名', // 表格表头显示文字
                         align: 'center', // 左右居中
-                        valign: 'middle' // 上下居中
+                        valign: 'middle', // 上下居中
+                        width: 200,
                     }, {
 /*                        field: 'gender', // 返回json数据中的name
                         title: '性别', // 表格表头显示文字

src/main/webapp/jsp/safety/SafetyCheckDaylyAdd.jsp

@@ -115,7 +115,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
     var fileinput = function () {
         $('#file').click();
     };
-    var filedel = function () {
+    var filedel = function (index) {
         fileList.splice(index,1)
         $('#test').html(initFileInputView())
     };

src/main/webapp/jsp/safety/SafetyJobInsideAdd.jsp

@@ -72,7 +72,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
     var fileinput = function () {
         $('#file').click();
     };
-    var filedel = function () {
+    var filedel = function (index) {
         fileList.splice(index, 1)
         $('#test').html(initFileInputView())
     };
@@ -234,7 +234,8 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
             {
                 formId: "addForm",
                 hiddenId: "userId",
-                textId: "userName"
+                textId: "userName",
+                displayDept: "true"
             }, function (data) {
                 $("#user4SelectDiv").html(data);
                 openModal("user4SelectModal");

src/main/webapp/jsp/safety/SafetyJobInsideSign.jsp

@@ -47,6 +47,11 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
         display: inline-block;
         vertical-align: top;
         padding: 8px;
+        width: 140px;
+        text-align: left;
+    }
+    .detail-row {
+        clear: both;
     }
 </style>
 <script type="text/javascript">
@@ -253,7 +258,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
     function initdeTail(list) {
         let temp = `<div >`
         list.forEach((item, index) => {
-            temp += `<div><div class="AAA">` + item.deptName + `</div>`
+            temp += `<div class="detail-row"><div class="AAA">` + item.deptName + `</div>`
             temp += `<div class="AAA">` + item.userName + `</div>`
             temp += `<div class="AAA">` + item.pass + `</div>`
             temp += `<div class="AAA">` + item.time + `</div></div>`
@@ -426,7 +431,9 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
                             </div>
                             <div class="form-group">
                                 <label class="col-sm-2 control-label ">查看其它会签意见</label>
-                                <div id="deTail"></div>
+                                <div class="col-sm-10">
+                                    <div id="deTail"></div>
+                                </div>
                             </div>
                             <div class="form-group" style="margin-left: 39px">
                                 <div id="fileList"></div>

src/main/webapp/jsp/sparepart/sewageList.jsp

@@ -354,7 +354,9 @@
 	                	  var buts= '';
 	                 	  buts+= '<button class="btn btn-default btn-sm" title="瞬时流量" onclick="showLineFun(\'' + (row.ventNum || '') + '\', \'SSLL\')"><i class="fa fa-line-chart"></i></button>';
 	                 	  buts+= '<button class="btn btn-default btn-sm" title="累计流量" onclick="showLineFun(\'' + (row.ventNum || '') + '\', \'LJLL\')"><i class="fa fa-area-chart"></i></button>';
-	                     buts+= '<button class="btn btn-default btn-sm" title="查看点位" onclick="showpointFun(\'' + row.name + '\')"><i class="fa fa-check-square-o"></i></button>';
+
+	                    //  buts+= '<button class="btn btn-default btn-sm" title="查看点位" onclick="showpointFun(\'' + row.name + '\')"><i class="fa fa-check-square-o"></i></button>';
+
 	                	   buts+= '<security:authorize buttonUrl="sparepart/sewage/edit.do">';
 	                 	   buts+= '<button class="btn btn-default btn-sm" title="编辑" onclick="editFun(\'' + row.id + '\')"><i class="fa fa-edit"></i><span class="hidden-md hidden-lg"> 编辑</span></button>';
 	                	   buts+= '</security:authorize>';
@@ -398,7 +400,17 @@
 
         //导出
         function downloadExcelFun() {
-            window.open(ext.contextPath + "/sparepart/sewage/downloadExcelFun.do");
+			var checkedItems = $("#table").bootstrapTable('getSelections');
+			var ids = "";
+			$.each(checkedItems, function(index, item){
+				ids += item.id + ",";
+			});
+			if(ids !== ""){
+				ids = ids.substring(0, ids.length - 1);
+				window.open(ext.contextPath + "/sparepart/sewage/downloadExcelFun.do?ids=" + encodeURIComponent(ids));
+			}else{
+				window.open(ext.contextPath + "/sparepart/sewage/downloadExcelFun.do");
+			}
         }
 </script>
 </head>

src/main/webapp/jsp/user/jobList.jsp

@@ -20,7 +20,10 @@
             src="<%=request.getContextPath()%>/node_modules/bootstrap-switch/dist/js/bootstrap-switch.min.js"
             charset="utf-8"></script>
     <script type="text/javascript">
-        var companyId = unitId;
+        var companyId = '';
+        $(function() {
+            companyId = unitId;
+        });
         var addFun = function () {
             $.post(ext.contextPath + '/user/addJob.do', {companyId: companyId}, function (data) {
                 $("#subDiv").html(data);

src/main/webapp/jsp/user/roleList.jsp

@@ -56,7 +56,7 @@
 
         //编辑用户信息
         var editUserFun = function (roleid, bizid) {
-            $.post(ext.contextPath + '/user/showRoleUser.do', { roleid: roleid }, function (data) {
+            $.post(ext.contextPath + '/user/showRoleUser.do', { roleid: roleid, bizid: bizid }, function (data) {
                 $("#subDiv_User").html(data);
                 openModal('roleUserModal');
             });

src/main/webapp/jsp/user/roleUser.jsp

@@ -88,9 +88,14 @@
 		$("#search_pid").select2({
 	          ajax: {
 	            type:'POST',
-	            url: ext.contextPath +"/work/group/getListForSelect.do",
+	            url: ext.contextPath +"/user/getDeptByBizId4Select.do",
 	            dataType: 'json',
 	            delay: 250,
+	            data: function (params) {
+	              return {
+	                companyId: '${companyId}'
+	              };
+	            },
 	            processResults: function (data) {
 	              return {
 	                results: data

src/main/webapp/jsp/user/userForSelectByCompany.jsp

@@ -20,7 +20,12 @@
                 if(datas_name!=""){
                 	datas_name+=",";
                 }
-                datas_name+=item.caption;
+                // 支持通过参数控制显示部门名称还是用户名称
+                var displayField = item.caption;
+                if('${param.displayDept}' === 'true' && item._pname) {
+                    displayField = item._pname;
+                }
+                datas_name+=displayField;
             });
         	 $('#${param.formId} #${param.hiddenId}' ).val(datas);
              $('#${param.formId} #${param.textId}').val(datas_name);

src/main/webapp/jsp/visual/modules/bigScreen_pipelineStatus.jsp

@@ -534,7 +534,7 @@
                 <img  src="/images/大屏/企业简介.png" style="height:60px;width:420px;"/>
               </div>
               <div style="float: left;width: 100%;height: 137px;padding-top: 10px;padding-left: 20px;color: #ffffff;line-height: 30px;font-size: 20px;font-weight: 400;letter-spacing:2px;">
-                &nbsp;&nbsp;&nbsp;&nbsp;上海金山排海工程有限公司成立于1993年，主要承担金山东部地区生活污水和工业废水的收集处理任务，服务范围包括金山东部亭林、张堰、山阳、漕泾四镇及金山工业区、金山新城区、金山卫钱圩地区，服务区域约155平方公里。
+                &nbsp;&nbsp;&nbsp;&nbsp;上海金山卫污水厂成立于1993年，主要承担金山东部地区生活污水和工业废水的收集处理任务，服务范围包括金山东部亭林、张堰、山阳、漕泾四镇及金山工业区、金山新城区、金山卫钱圩地区，服务区域约155平方公里。
               </div>
             </div>
             <div style='position: absolute;width: 440px;height: 470px;left: 21px;

src/main/webapp/jsp/visual/newSourceGISPage.jsp

@@ -233,12 +233,12 @@ pageEncoding="UTF-8"%>
             class="drawer-nav-icon"
           />企业
         </div>
-        <div class="drawer-nav-item" onclick="switchTab('tab-pipeline', this)">
+        <!-- <div class="drawer-nav-item" onclick="switchTab('tab-pipeline', this)">
           <img
             src="<%=request.getContextPath()%>/IMG/icon_gd.png"
             class="drawer-nav-icon"
           />管道
-        </div>
+        </div> -->
         <!-- <div class="drawer-nav-item" onclick="switchTab('tab-well', this)">
           <img
             src="<%=request.getContextPath()%>/IMG/icon_gj.png"
@@ -548,15 +548,6 @@ pageEncoding="UTF-8"%>
           </div>
 
           <div style="max-height: 400px; overflow-y: auto" id="company-table-container">
-            <div id="company-loading" style="display: none; text-align: center; padding: 20px;">
-              <i class="glyphicon glyphicon-refresh" style="font-size: 24px; color: #007bff; animation: spin 1s infinite linear;"></i>
-              <p style="margin-top: 10px; color: #666; font-size: 12px">数据加载中...</p>
-              <style>
-                @keyframes spin {
-                  100% { transform: rotate(360deg); }
-                }
-              </style>
-            </div>
             <table
               class="table table-bordered table-hover table-condensed table-custom"
               style="font-size: 12px; white-space: nowrap"
@@ -578,6 +569,10 @@ pageEncoding="UTF-8"%>
               </thead>
               <tbody id="company-table-body"></tbody>
             </table>
+            <div id="company-loading" style="display: none; text-align: center; padding: 20px;">
+              <i class="glyphicon glyphicon-refresh" style="font-size: 24px; color: #007bff; animation: spin 1s infinite linear;"></i>
+              <p style="margin-top: 10px; color: #666; font-size: 12px">数据加载中...</p>
+            </div>
           </div>
         </div>
 
@@ -1116,12 +1111,12 @@ pageEncoding="UTF-8"%>
           // 泵站名称到经纬度的映射
           lngLatMap: {
             '卫八路泵站': { lng: 121.277502, lat: 30.720661 },
-            '春华泵站': { lng: 121.287567, lat: 30.727986 },
+            '春华路泵站': { lng: 121.287567, lat: 30.727986 },
-            '九号泵站': { lng: 121.286513, lat: 30.716669 }
+            '九号泵站': { lng: 121.286513, lat: 30.716669 },
           },
           transform: function(item, idx) {
             var name = item.text || item.name || '';
-            var lngLat = this.lngLatMap[name] || { lng: 121.32 + idx * 0.01, lat: 30.76 - idx * 0.005 };
+            var lngLat = this.lngLatMap[name] ? this.lngLatMap[name] : { lng: 121.32 + idx * 0.01, lat: 30.76 - idx * 0.005 };
             return {
               id: item.id || 'pump_' + idx,
               name: name,
@@ -1330,7 +1325,9 @@ pageEncoding="UTF-8"%>
             // 直接返回数组
             list = res;
           }
-          config.data = list.map(config.transform);
+          config.data = list.map(function(item, idx) {
+            return config.transform(item, idx);
+          });
           config.loaded = true;
           console.log('[' + type + '] 加载完成:', config.data.length, '条');
           return config.data;
@@ -1605,7 +1602,7 @@ pageEncoding="UTF-8"%>
         var item = dataConfig.company.data[index];
         if (!item || !item.lng || !item.lat) return;
         map.panTo(new T.LngLat(item.lng, item.lat));
-        map.setZoom(15);
+        map.setZoom(16);
         selectMarker(item.name, 'company');
       }
 

src/main/webapp/jsp/work/KPIPointAdd.jsp

@@ -113,7 +113,7 @@ var selectMPint = function(pid) {
                          formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
                    });  
                   if(data!=null && data.length>0){
-                      selelct_.val(data[0].id).trigger("change");
+                      selelct_.val(data[0].id).trigger("change.select2");
                   }
               },'json'); 
    		   }else{
@@ -131,8 +131,8 @@ var selectMPint = function(pid) {
 	                  formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果
 	                  formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
 	            }); 
-	            selelct.val('').trigger("change");
+              selelct.val('').trigger("change.select2");
-	            selelct.on("change",function(e){
+              selelct.off("select2:select select2:clear").on("select2:select select2:clear",function(){
 	                var companyId= $(this).val();
 	                $.post(ext.contextPath + "/user/processSection/getProcessSection4Select.do", {companyId:companyId}, function(data) {
 	                    $("#processsectionid").empty(); 
@@ -147,8 +147,8 @@ var selectMPint = function(pid) {
 	                           formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果
 	                           formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
 	                     });  
-	                     selelct_.val('${kPIPoint.processsectionid}').trigger("change");
+                       selelct_.val('${kPIPoint.processsectionid}').trigger("change.select2");
-	                },'json');  
+	                },'json');
 	            });
    		   }
           },'json');  

src/main/webapp/jsp/work/KPIPointEdit.jsp

@@ -89,8 +89,8 @@ var selectMPint = function(pid) {
                    formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果
                    formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
              });  
-            selelct_.val('${kPIPoint.processsectionid}').trigger("change");
+            selelct_.val('${kPIPoint.processsectionid}').trigger("change.select2");
-        },'json');  
+        },'json');
     };
     
     $(function(){
@@ -116,8 +116,8 @@ var selectMPint = function(pid) {
                         formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果
                         formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
                   });  
-                selelct_.val('${kPIPoint.processsectionid}').trigger("change");
+                selelct_.val('${kPIPoint.processsectionid}').trigger("change.select2");
-             },'json'); 
+             },'json');
   		   }else{
   			    $("#hidden_bizid").attr("disabled","disabled");
   			    $("#input_bizid").css("display", "none");
@@ -133,8 +133,8 @@ var selectMPint = function(pid) {
 	                  formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果
 	                  formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
 	            }); 
-	            selelct.val('${kPIPoint.bizid}').trigger("change");
+              selelct.val('${kPIPoint.bizid}').trigger("change.select2");
-	            selelct.on("change",function(e){
+              selelct.off("select2:select select2:clear").on("select2:select select2:clear",function(){
 	                var companyId= $(this).val();
 	                $.post(ext.contextPath + "/user/processSection/getProcessSection4Select.do", {companyId:companyId}, function(data) {
 	                    $("#processsectionid").empty(); 
@@ -149,8 +149,8 @@ var selectMPint = function(pid) {
 	                           formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果
 	                           formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
 	                     });  
-	                    selelct_.val('').trigger("change");
+                      selelct_.val('').trigger("change.select2");
-	                },'json');  
+	                },'json');
 	            });
   		   }
          },'json'); 

src/main/webapp/jsp/work/KPIPointList.jsp

@@ -1,406 +1,435 @@
-<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ page language="java" pageEncoding="UTF-8" %>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="com.sipai.entity.base.ServerObject"%>
+<%@ page import="com.sipai.entity.base.ServerObject" %>
-<%@ taglib uri="http://www.springsecurity.org/jsp" prefix="security"%>
+<%@ taglib uri="http://www.springsecurity.org/jsp" prefix="security" %>
 <!DOCTYPE html>
 <!-- <html lang="zh-CN"> -->
 <!-- BEGIN HEAD -->
 <head>
-<title><%= ServerObject.atttable.get("TOPTITLE")%></title>
+    <title><%= ServerObject.atttable.get("TOPTITLE")%>
+    </title>
 
-<!-- 引用页头及CSS页-->
+    <!-- 引用页头及CSS页-->
-<jsp:include page="/jsp/inc.jsp"></jsp:include>
+    <jsp:include page="/jsp/inc.jsp"></jsp:include>
-<style type="text/css">
+    <style type="text/css">
-    .select2-container .select2-selection--single{  
+        .select2-container .select2-selection--single {
-      height:34px;  
+            height: 34px;
-      line-height: 34px;  
+            line-height: 34px;
-    }
+        }
-    .select2-selection__arrow{
-    margin-top:3px;
-    }  
-</style>
-<script type="text/javascript">
-var companyId = "";
-	var showMaintenanceList = function(id) {
-	    $.post(ext.contextPath + '/maintenance/showMaintenanceList4Equipment.do', {equipmentId:id} , function(data) {
-	        $("#subDiv").html(data);
-	        openModal('subMaintenanceModal');
-	    }); 
-	};
-	var showHandleDetailList = function(id) {
-		stopBubbleDefaultEvent();
-        $.post(ext.contextPath + '/maintenance/showHandleDetailList4Equipment.do', {equipmentId:id} , function(data) {
-            $("#subDiv").html(data);
-            openModal('handleDetailModal');
-        }); 
-    };
-    var viewEquipmentFun = function(equipmentName,equipmentCardID,id) {
-        $.post(ext.contextPath + '/equipment/viewEquipmentCard.do', {equipmentName:equipmentName,equipmentCardID:equipmentCardID,id:id} , function(data) {
-            $("#subEquipmentDiv").html(data);
-            openModal('subEquipmentModal');
-        }); 
-    };
 
-	var addFun = function() {
+        .select2-selection__arrow {
-        $.post(ext.contextPath + '/work/kpipoint/add.do', {} , function(data) {
+            margin-top: 3px;
-            $("#subDiv").html(data);
+        }
-            openModal('subModal');
+    </style>
-        }); 
+    <script type="text/javascript">
-	};
+        var companyId = "";
+        var showMaintenanceList = function (id) {
+            $.post(ext.contextPath + '/maintenance/showMaintenanceList4Equipment.do', {equipmentId: id}, function (data) {
+                $("#subDiv").html(data);
+                openModal('subMaintenanceModal');
+            });
+        };
+        var showHandleDetailList = function (id) {
+            stopBubbleDefaultEvent();
+            $.post(ext.contextPath + '/maintenance/showHandleDetailList4Equipment.do', {equipmentId: id}, function (data) {
+                $("#subDiv").html(data);
+                openModal('handleDetailModal');
+            });
+        };
+        var viewEquipmentFun = function (equipmentName, equipmentCardID, id) {
+            $.post(ext.contextPath + '/equipment/viewEquipmentCard.do', {
+                equipmentName: equipmentName,
+                equipmentCardID: equipmentCardID,
+                id: id
+            }, function (data) {
+                $("#subEquipmentDiv").html(data);
+                openModal('subEquipmentModal');
+            });
+        };
 
-	var editFun = function(id) {
+        var addFun = function () {
-		stopBubbleDefaultEvent();
+            $.post(ext.contextPath + '/work/kpipoint/add.do', {}, function (data) {
-        $.post(ext.contextPath + '/work/kpipoint/edit.do', {id:id} , function(data) {
+                $("#subDiv").html(data);
-        	$("#subDiv").html(data);
+                openModal('subModal');
-        	openModal('subModal');
+            });
-        }); 
+        };
-	};
 
-	var viewFun = function(id){
+        var editFun = function (id) {
-	     $.post(ext.contextPath + '/work/kpipoint/view.do', {id:id} , function(data) {
+            stopBubbleDefaultEvent();
-        	$("#subDiv").html(data);
+            $.post(ext.contextPath + '/work/kpipoint/edit.do', {id: id}, function (data) {
-        	openModal('subModal');
+                $("#subDiv").html(data);
-        }); 
+                openModal('subModal');
-	};
+            });
+        };
+
+        var viewFun = function (id) {
+            $.post(ext.contextPath + '/work/kpipoint/view.do', {id: id}, function (data) {
+                $("#subDiv").html(data);
+                openModal('subModal');
+            });
+        };
+
+        var deleteFun = function (id) {
+            stopBubbleDefaultEvent();
+            swal({
+                text: "您确定要删除此记录？",
+                dangerMode: true,
+                buttons: {
+                    cancel: {
+                        text: "取消",
+                        value: null,
+                        visible: true,
+                        className: "btn btn-default btn-sm",
+                        closeModal: true,
+                    },
+                    confirm: {
+                        text: "确定",
+                        value: true,
+                        visible: true,
+                        className: "btn btn-danger btn-sm",
+                        closeModal: true
+                    }
+                }
+            })
+                .then(function (willDelete) {
+                    if (willDelete) {
+                        $.post(ext.contextPath + '/work/kpipoint/delete.do', {id: id}, function (data) {
+                            if (data == 1) {
+                                $("#table").bootstrapTable('refresh');
+                            } else {
+                                showAlert('d', '删除失败', 'mainAlertdiv');
+                            }
+                        });
 
-	var deleteFun = function(id) {
-		stopBubbleDefaultEvent();
-		swal({
-			  text: "您确定要删除此记录？",
-			  dangerMode: true,
-			  buttons: {
-				    cancel: {
-				        text: "取消",
-				        value: null,
-				        visible: true,
-				        className: "btn btn-default btn-sm",
-				        closeModal: true,
-				      },
-				      confirm: {
-				        text: "确定",
-				        value: true,
-				        visible: true,
-				        className: "btn btn-danger btn-sm",
-				        closeModal: true
-				      }
-				}
-			})
-            .then(function(willDelete) {
-			  if (willDelete) {
-                $.post(ext.contextPath + '/work/kpipoint/delete.do', {id : id}, function(data) {
-                    if(data==1){
-                    	$("#table").bootstrapTable('refresh');
-                    }else{
-                    	showAlert('d','删除失败','mainAlertdiv'); 
                     }
                 });
-			    
+        };
-			  }
+        //删除多条资产类型数据
-			});
+        var deletesFun = function () {
-	};
+            var checkedItems = $("#table").bootstrapTable('getSelections');
-	//删除多条资产类型数据
+            var datas = "";
-	var deletesFun = function() {
+            $.each(checkedItems, function (index, item) {
-	    var checkedItems = $("#table").bootstrapTable('getSelections');
+                datas += item.id + ",";
-	    var datas="";
+            });
-	    $.each(checkedItems, function(index, item){
+            if (datas == "") {
-	        datas+=item.id+",";
+                showAlert('d', '请先选择记录', 'mainAlertdiv');
-	    }); 
+            } else {
-	    if(datas==""){
+                swal({
-	    	showAlert('d','请先选择记录','mainAlertdiv');
+                    text: "您确定要删除此记录？",
-	    }else{
+                    dangerMode: true,
-	    	swal({
+                    buttons: {
-	              text: "您确定要删除此记录？",
+                        cancel: {
-	              dangerMode: true,
+                            text: "取消",
-	              buttons: {
+                            value: null,
-	                    cancel: {
+                            visible: true,
-	                        text: "取消",
+                            className: "btn btn-default btn-sm",
-	                        value: null,
+                            closeModal: true,
-	                        visible: true,
+                        },
-	                        className: "btn btn-default btn-sm",
+                        confirm: {
-	                        closeModal: true,
+                            text: "确定",
-	                      },
+                            value: true,
-	                      confirm: {
+                            visible: true,
-	                        text: "确定",
+                            className: "btn btn-danger btn-sm",
-	                        value: true,
+                            closeModal: true
-	                        visible: true,
+                        }
-	                        className: "btn btn-danger btn-sm",
+                    }
-	                        closeModal: true
+                })
-	                      }
+                    .then(function (willDelete) {
-	                }
+                        if (willDelete) {
-	            })
+                            $.post(ext.contextPath + '/work/kpipoint/deletes.do', {ids: datas}, function (data) {
-	            .then(function(willDelete) {
+                                if (data > 0) {
-	              if (willDelete) {
+                                    $("#table").bootstrapTable('refresh');
-	            	  $.post(ext.contextPath + '/work/kpipoint/deletes.do', {ids:datas} , function(data) {
+                                } else {
-	            		  if(data>0){
+                                    showAlert('d', '删除失败', 'mainAlertdiv');
-	                          $("#table").bootstrapTable('refresh');
+                                }
-	                      }else{
+                            });
-	                          showAlert('d','删除失败','mainAlertdiv'); 
+
-	                      }
+                        }
-	                  });
+                    });
-	                
+            }
-	              }
+        };
-	            });
+        var dosearch = function () {
-	    }
+            $("#table").bootstrapTable('refresh');
-	};
+        };
-    var dosearch = function() {
+        var loadProcessSectionSelect = function (bizId) {
-        $("#table").bootstrapTable('refresh');
+            if (!bizId) {
-    };
+                refreshSelect();
-    var refreshSelect = function() {
+                return;
-        var selelct_ =$("#processSection").select2({
+            }
-            data: null,
+            $.post(ext.contextPath + "/user/processSection/getProcessSection4Select.do", {companyId: bizId}, function (data) {
-            placeholder:'请选择',//默认文字提示
+                $("#processSection").empty();
-            allowClear: true,//允许清空
+                var selelct_ = $("#processSection").select2({
-            escapeMarkup: function (markup) { return markup; }, // 自定义格式化防止xss注入
+                    data: data,
-            language: "zh-CN", 
+                    cache: false,
-            minimumInputLength: 0,
+                    placeholder: '请选择',
-            minimumResultsForSearch: 10,//数据超过十个启用搜索框
+                    allowClear: true,
-        });
+                    escapeMarkup: function (markup) {
-        $("#processSection").empty(); 
+                        return markup;
-        // $("#table").bootstrapTable('refresh', {data:null});
+                    },
-        $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'})
+                    language: "zh-CN",
-    };
+                    minimumInputLength: 0,
-    
+                    minimumResultsForSearch: 10,
-    
+                    formatResult: function formatRepo(repo) {
-    $(function() {
+                        return repo.text;
-    	 $.post(ext.contextPath + "/user/getSearchBizsByUserId4Select.do", {}, function(data) {
+                    },
-  		   if(data.length == 1){
+                    formatSelection: function formatRepoSelection(repo) {
-  		       //选择厂区为一个厂时隐藏选择框
+                        return repo.text;
-  			   $("#search_code").css("display", "none");
+                    }
-  			   $("#company").text(data[0].text);
+                });
-  			   companyId=data[0].id;
+                $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'});
-  			   dosearch();
+                // 初始化时仅刷新控件显示，不触发查询
-  		       $.post(ext.contextPath + "/user/processSection/getProcessSection4Select.do", {companyId:companyId}, function(data) {
+                selelct_.val('').trigger("change.select2");
-                 $("#processSection").empty(); 
+                // 用select2事件触发查询，避免普通change导致选中文本被立即重置
-                 var selelct_ =$("#processSection").select2({
+                selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function () {
+                    // 让select2先完成渲染，再执行查询
+                    setTimeout(function () {
+                        dosearch();
+                    }, 0);
+                });
+            }, 'json');
+        };
+        var refreshSelect = function () {
+            var selelct_ = $("#processSection").select2({
+                data: null,
+                placeholder: '请选择',//默认文字提示
+                allowClear: true,//允许清空
+                escapeMarkup: function (markup) {
+                    return markup;
+                }, // 自定义格式化防止xss注入
+                language: "zh-CN",
+                minimumInputLength: 0,
+                minimumResultsForSearch: 10,//数据超过十个启用搜索框
+            });
+            $("#processSection").empty();
+            // $("#table").bootstrapTable('refresh', {data:null});
+            $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'})
+        };
+
+
+        $(function () {
+            $.post(ext.contextPath + "/user/getSearchBizsByUserId4Select.do", {}, function (data) {
+                if (data.length == 1) {
+                    //选择厂区为一个厂时隐藏选择框
+                    $("#search_code").css("display", "none");
+                    $("#company").text(data[0].text);
+                    companyId = data[0].id;
+                    loadProcessSectionSelect(companyId);
+                    dosearch();
+                } else {
+                    // 当前页面可能不展示厂区下拉（search_code被注释），兜底按当前厂区/首个厂区加载工艺段
+                    if ($("#search_code").length == 0) {
+                        companyId = (typeof unitId !== "undefined" && unitId) ? unitId : data[0].id;
+                        loadProcessSectionSelect(companyId);
+                        dosearch();
+                        return;
+                    }
+                    $("#company").css("display", "none");
+                    var selelct = $("#search_code").select2({
                         data: data,
-                        cache : false,
+                        placeholder: '请选择',//默认文字提示
-                        placeholder:'请选择',//默认文字提示
                         allowClear: true,//允许清空
-                        escapeMarkup: function (markup) { return markup; }, // 自定义格式化防止xss注入
+                        escapeMarkup: function (markup) {
-                        language: "zh-CN", 
+                            return markup;
+                        }, // 自定义格式化防止xss注入
+                        language: "zh-CN",
                         minimumInputLength: 0,
                         minimumResultsForSearch: 10,//数据超过十个启用搜索框
-                        formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果
+                        formatResult: function formatRepo(repo) {
-                        formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
+                            return repo.text;
-                  });  
+                        }, // 函数用来渲染结果
-                 $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'})
+                        formatSelection: function formatRepoSelection(repo) {
-                 selelct_.val('').trigger("change");
+                            return repo.text;
-                 selelct_.on("change",function(e){
+                        } // 函数用于呈现当前的选择
-                     dosearch();
+                    });
-                 });
+                    $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'})
-                 
+                    selelct.val('').trigger("change.select2");
-             },'json'); 
+                    refreshSelect();
-  		   }else{
+                    selelct.off("select2:select select2:clear").on("select2:select select2:clear", function () {
-  			   $("#company").css("display", "none");
+                        companyId = $(this).val();
-  			   var selelct=$("#search_code").select2({
+                        dosearch();
-  				  data : data ,
+                        refreshSelect();
-  		          placeholder:'请选择',//默认文字提示
+                        loadProcessSectionSelect(companyId);
-  		          allowClear: true,//允许清空
+                    });
-  		          escapeMarkup: function (markup) { return markup; }, // 自定义格式化防止xss注入
-  		          language: "zh-CN", 
-  		          minimumInputLength: 0,
-  		          minimumResultsForSearch: 10,//数据超过十个启用搜索框
-  		          formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果
-  		          formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
-  		        }); 
-  		        $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'})
-  		        selelct.val('').trigger("change");
-  		        refreshSelect();
-  		        selelct.on("change",function(e){
-  		            companyId= $(this).val();
-  		            dosearch();
-  		            refreshSelect();
-  		            $.post(ext.contextPath + "/user/processSection/getProcessSection4Select.do", {companyId:companyId}, function(data) {
-  		               $("#processSection").empty(); 
-  		               var selelct_ =$("#processSection").select2({
-  		                      data: data,
-  		                      cache : false,
-  		                      placeholder:'请选择',//默认文字提示
-  		                      allowClear: true,//允许清空
-  		                      escapeMarkup: function (markup) { return markup; }, // 自定义格式化防止xss注入
-  		                      language: "zh-CN", 
-  		                      minimumInputLength: 0,
-  		                      minimumResultsForSearch: 10,//数据超过十个启用搜索框
-  		                      formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果
-  		                      formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
-  		                });  
-  		               $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'})
-  		               selelct_.val('').trigger("change");
-  		               selelct_.on("change",function(e){
-  		                   dosearch();
-  		               });
-  		           },'json');   
-  		        });  
-  		   }
-         },'json');  
-       
-        $("#table").bootstrapTable({ // 对应table标签的id
-            url: ext.contextPath + '/work/kpipoint/getlist.do', // 获取表格数据的url
-            cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
-            striped: true,  //表格显示条纹，默认为false
-            pagination: true, // 在表格底部显示分页组件，默认false
-            pageList: [10, 20,50], // 设置页面可以显示的数据条数
-            pageSize: 50, // 页面数据条数
-            pageNumber: 1, // 首页页码
-            sidePagination: 'server', // 设置为服务器端分页
-            queryParams: function (params) { // 请求服务器数据时发送的参数，可以在这里添加额外的查询参数，返回false则终止请求
-                return {
-                    rows: params.limit, // 每页要显示的数据条数
-                    page: params.offset/params.limit+1, // 每页显示数据的开始页码
-                    sort: params.sort, // 要排序的字段
-                    order: params.order,
-                    search_name : $('#search_name').val(),
-                    companyId: unitId,
-                    pSectionId: $("#processSection").val(),
                 }
-            },
+            }, 'json');
-            sortName: 'grade', // 要排序的字段
+
-            sortOrder: 'asc', // 排序规则
+            $("#table").bootstrapTable({ // 对应table标签的id
-            onClickRow: function (row) {//单击行事件,执行查看功能
+                url: ext.contextPath + '/work/kpipoint/getlist.do', // 获取表格数据的url
-            	viewFun(row.id);
+                cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
-            }, 
+                striped: true,  //表格显示条纹，默认为false
-            columns: [
+                pagination: true, // 在表格底部显示分页组件，默认false
-                {
+                pageList: [10, 20, 50], // 设置页面可以显示的数据条数
-	                  checkbox: true, // 显示一个勾选框
+                pageSize: 50, // 页面数据条数
-	            },{
+                pageNumber: 1, // 首页页码
-                    field: 'mpointid', // 返回json数据中的name
+                sidePagination: 'server', // 设置为服务器端分页
-                    title: '测量点编号', // 表格表头显示文字
+                queryParams: function (params) { // 请求服务器数据时发送的参数，可以在这里添加额外的查询参数，返回false则终止请求
-                    align: 'center', // 左右居中
+                    return {
-                    valign: 'middle' // 上下居中
+                        rows: params.limit, // 每页要显示的数据条数
-                },{
+                        page: params.offset / params.limit + 1, // 每页显示数据的开始页码
-                    field: 'mpointname', // 返回json数据中的name
+                        sort: params.sort, // 要排序的字段
-                    title: '测量点名称', // 表格表头显示文字
+                        order: params.order,
-                    align: 'center', // 左右居中
+                        search_name: $('#search_name').val(),
-                    valign: 'middle' // 上下居中
+                        companyId: companyId,
-                },{
+                        pSectionId: $("#processSection").val(),
-                    field: 'bizid', // 返回json数据中的name
-                    title: '所属厂区', // 表格表头显示文字
-                    align: 'center', // 左右居中
-                    valign: 'middle' // 上下居中
-                },{
-                    field: 'processectionname', // 返回json数据中的name
-                    title: '工艺段', // 表格表头显示文字
-                    align: 'center', // 左右居中
-                    valign: 'middle' // 上下居中
-                },{
-                    field: 'grade', // 返回json数据中的name
-                    title: '重要等级', // 表格表头显示文字
-                    align: 'center', // 左右居中
-                    valign: 'middle'
-                },{
-                    title: "操作",
-                    align: 'center',
-                    valign: 'middle',
-                    width: 120, // 定义列的宽度，单位为像素px
-                    formatter: function (value, row, index) {
-                        var buts="";
-                           buts+= '<security:authorize buttonUrl="work/scadaPic/edit.do">';
-	                	   buts+= '<button class="btn btn-default btn-sm" title="编辑" onclick="editFun(\'' + row.id + '\')"><i class="fa fa-edit"></i><span class="hidden-md hidden-lg"> 编辑</span></button>';
-	                	   buts+= '</security:authorize>';
-	                	   
-	                	   buts+= '<security:authorize buttonUrl="work/scadaPic/delete.do">';
-                           buts+='<button class="btn btn-default btn-sm" title="删除" onclick="deleteFun(\''+row.id+'\')"><i class="fa fa fa-trash-o"></i><span class="hidden-md hidden-lg">删除</span></button';
-                           buts+= '</security:authorize>';
-                           
-	                       buts='<div class="btn-group" >'+buts+'</div>';
-                        return buts;
                     }
+                },
+                sortName: 'grade', // 要排序的字段
+                sortOrder: 'asc', // 排序规则
+                onClickRow: function (row) {//单击行事件,执行查看功能
+                    viewFun(row.id);
+                },
+                columns: [
+                    {
+                        checkbox: true, // 显示一个勾选框
+                    }, {
+                        field: 'mpointid', // 返回json数据中的name
+                        title: '测量点编号', // 表格表头显示文字
+                        align: 'center', // 左右居中
+                        valign: 'middle' // 上下居中
+                    }, {
+                        field: 'mpointname', // 返回json数据中的name
+                        title: '测量点名称', // 表格表头显示文字
+                        align: 'center', // 左右居中
+                        valign: 'middle' // 上下居中
+                    }, {
+                        field: 'bizid', // 返回json数据中的name
+                        title: '所属厂区', // 表格表头显示文字
+                        align: 'center', // 左右居中
+                        valign: 'middle' // 上下居中
+                    }, {
+                        field: 'processectionname', // 返回json数据中的name
+                        title: '工艺段', // 表格表头显示文字
+                        align: 'center', // 左右居中
+                        valign: 'middle' // 上下居中
+                    }, {
+                        field: 'grade', // 返回json数据中的name
+                        title: '重要等级', // 表格表头显示文字
+                        align: 'center', // 左右居中
+                        valign: 'middle'
+                    }, {
+                        title: "操作",
+                        align: 'center',
+                        valign: 'middle',
+                        width: 120, // 定义列的宽度，单位为像素px
+                        formatter: function (value, row, index) {
+                            var buts = "";
+                            buts += '<security:authorize buttonUrl="work/scadaPic/edit.do">';
+                            buts += '<button class="btn btn-default btn-sm" title="编辑" onclick="editFun(\'' + row.id + '\')"><i class="fa fa-edit"></i><span class="hidden-md hidden-lg"> 编辑</span></button>';
+                            buts += '</security:authorize>';
+
+                            buts += '<security:authorize buttonUrl="work/scadaPic/delete.do">';
+                            buts += '<button class="btn btn-default btn-sm" title="删除" onclick="deleteFun(\'' + row.id + '\')"><i class="fa fa fa-trash-o"></i><span class="hidden-md hidden-lg">删除</span></button';
+                            buts += '</security:authorize>';
+
+                            buts = '<div class="btn-group" >' + buts + '</div>';
+                            return buts;
+                        }
+                    }
+                ],
+                onLoadSuccess: function () {  //加载成功时执行
+                    adjustBootstrapTableView("table");
+                },
+                onLoadError: function () {  //加载失败时执行
+                    console.info("加载数据失败");
                 }
-            ],
+
-            onLoadSuccess: function(){  //加载成功时执行
+            })
-                adjustBootstrapTableView("table");
+
-            },
+
-            onLoadError: function(){  //加载失败时执行
+        });
-                  console.info("加载数据失败");
+    </script>
-            }
-      
-      })
-        
-       
-    });
-</script>
 
 </head>
 <body onload="initMenu()" class="hold-transition ${cu.themeclass} sidebar-mini">
-    <div class="wrapper">
+<div class="wrapper">
-        <!-- 引用top -->
+    <!-- 引用top -->
-       <%-- <jsp:include page="/jsp/top.jsp"></jsp:include> --%>
+    <%-- <jsp:include page="/jsp/top.jsp"></jsp:include> --%>
-        <!-- 菜单栏 -->
+    <!-- 菜单栏 -->
-        <%-- <jsp:include page="/jsp/left.jsp"></jsp:include>  --%>
+    <%-- <jsp:include page="/jsp/left.jsp"></jsp:include>  --%>
-        <div class="content-wrapper">
+    <div class="content-wrapper">
-             <!-- Content Header (Page header) -->
+        <!-- Content Header (Page header) -->
-             <section class="content-header">
+        <section class="content-header">
-               <h1 id ="head_title"></h1>
+            <h1 id="head_title"></h1>
-               <ol class="breadcrumb">
+            <ol class="breadcrumb">
-                 <li><a id ='head_firstlevel' href="#"><i class="fa fa-dashboard"></i> </a></li>
+                <li><a id='head_firstlevel' href="#"><i class="fa fa-dashboard"></i> </a></li>
-                 <!-- <li class="active">Here</li> -->
+                <!-- <li class="active">Here</li> -->
-               </ol>
+            </ol>
-             </section>
+        </section>
-             <!-- Main content -->
+        <!-- Main content -->
-             <section class="content container-fluid">
+        <section class="content container-fluid">
-                <div id="mainAlertdiv"></div>
+            <div id="mainAlertdiv"></div>
-                <div id="subDiv"></div>
+            <div id="subDiv"></div>
-                <div id="mpSubDiv"></div>
+            <div id="mpSubDiv"></div>
-                <div >
+            <div>
-                    <!-- <div class="form-group">
+                <!-- <div class="form-group">
-	                                <label class="form-label" id="companylabel">水厂：</label>
+                                <label class="form-label" id="companylabel">水厂：</label>
-	                                <label class="form-label" id="company" style="width:180px;border: none;background: transparent;" ></label>
+                                <label class="form-label" id="company" style="width:180px;border: none;background: transparent;" ></label>
-	                                 <select class="form-control select2 "  id="search_code" name ="search_code" style="width: 220px;"></select>
+                                 <select class="form-control select2 "  id="search_code" name ="search_code" style="width: 220px;"></select>
-	                </div> -->
+                </div> -->
-                    <div class="form-group form-inline" style="padding:0;">
+                <div class="form-group form-inline" style="padding:0;">
+                    <div class="form-group  form-inline">
                         <div class="form-group  form-inline">
-	                        <div class="form-group  form-inline">
+                            <div class="btn-group" style="width: 220px;padding-bottom:10px;">
-	                             <div class="btn-group" style="width: 220px;padding-bottom:10px;">
+                                <security:authorize buttonUrl="work/scadaPic/add.do">
-							<security:authorize buttonUrl="work/scadaPic/add.do">
+                                    <button type="button" class="btn btn-default btn-sm" onclick="addFun();"><i
-								<button type="button" class="btn btn-default btn-sm" onclick="addFun();"><i class="fa fa-plus"></i> 新增</button>
+                                            class="fa fa-plus"></i> 新增
-								<button type="button" class="btn btn-default btn-sm" onclick="deletesFun();"><i class="fa fa-trash-o"></i> 删除</button>
+                                    </button>
-							</security:authorize>
+                                    <button type="button" class="btn btn-default btn-sm" onclick="deletesFun();"><i
-					</div>
+                                            class="fa fa-trash-o"></i> 删除
-	                        </div>
+                                    </button>
-                        </div>
+                                </security:authorize>
-                        <div class="form-group pull-right" >
-                             <div class="input-group input-group-sm" style="width: 250px;">
-                               <input type="text" id="search_name" name="search_name" class="form-control pull-right" placeholder="编号">
-                               <div class="input-group-btn">
-                                 <button  class="btn btn-default" onclick="dosearch();"><i class="fa fa-search"></i></button>
-                               </div>
                             </div>
                         </div>
-                       <div class="form-group pull-right">
-	                            <label class="form-label">工艺段</label>
-	                            <select class="form-control select2 "  id="processSection" name ="processSection" style="width: 220px;"></select>
-	                        </div>
                     </div>
-                          
+                    <div class="form-group pull-right">
-                    <table id="table"></table>
+                        <div class="input-group input-group-sm" style="width: 250px;">
+                            <input type="text" id="search_name" name="search_name" class="form-control pull-right"
+                                   placeholder="编号">
+                            <div class="input-group-btn">
+                                <button class="btn btn-default" onclick="dosearch();"><i class="fa fa-search"></i>
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="form-group pull-right">
+                        <label class="form-label">工艺段</label>
+                        <select class="form-control select2 " id="processSection" name="processSection"
+                                style="width: 220px;"></select>
+                    </div>
                 </div>
-                
+
-                 
+                <table id="table"></table>
-            
+            </div>
-             </section>
+
-             <!-- /.content -->
+
-        </div>
+        </section>
-        <%--  <jsp:include page="/jsp/bottom.jsp"></jsp:include>  --%>
+        <!-- /.content -->
-       <%-- <jsp:include page="/jsp/side.jsp"></jsp:include>  --%>
     </div>
+    <%--  <jsp:include page="/jsp/bottom.jsp"></jsp:include>  --%>
+    <%-- <jsp:include page="/jsp/side.jsp"></jsp:include>  --%>
+</div>
 </body>
 <!-- 文件上传-->
 <link rel="stylesheet" href="<%=request.getContextPath()%>/node_modules/bootstrap-fileinput/css/fileinput.min.css"/>
 <%-- <script type="text/javascript" src="<%=request.getContextPath()%>/node_modules/bootstrap-fileinput/js/fileinput.min.js" charset="utf-8"></script>
 <script type="text/javascript" src="<%=request.getContextPath()%>/node_modules/bootstrap-fileinput/js/locales/zh.js" charset="utf-8"></script>  --%>
 <script type="text/javascript">
-document.write("<scr"+"ipt src=\"<%=request.getContextPath()%>/node_modules/bootstrap-fileinput/js/fileinput.min.js\"></sc"+"ript>")
+    document.write("<scr" + "ipt src=\"<%=request.getContextPath()%>/node_modules/bootstrap-fileinput/js/fileinput.min.js\"></sc" + "ript>")
-document.write("<scr"+"ipt src=\"<%=request.getContextPath()%>/node_modules/bootstrap-fileinput/js/locales/zh.js\"></sc"+"ript>")
+    document.write("<scr" + "ipt src=\"<%=request.getContextPath()%>/node_modules/bootstrap-fileinput/js/locales/zh.js\"></sc" + "ript>")
-</script> 
+</script>
 <!-- 引入ChartJS-->
-<script type="text/javascript" src="<%=request.getContextPath()%>/node_modules/chart.js/dist/Chart.min.js" charset="utf-8"></script>
+<script type="text/javascript" src="<%=request.getContextPath()%>/node_modules/chart.js/dist/Chart.min.js"
-<script type="text/javascript" src="<%=request.getContextPath()%>/node_modules/chart.js/dist/Chart.bundle.min.js" charset="utf-8"></script>
+        charset="utf-8"></script>
+<script type="text/javascript" src="<%=request.getContextPath()%>/node_modules/chart.js/dist/Chart.bundle.min.js"
+        charset="utf-8"></script>
 <!-- 引入daterangepicker-->
-<link rel="stylesheet"  href="<%=request.getContextPath()%>/plugins/bootstrap-daterangepicker/daterangepicker.css"/>
+<link rel="stylesheet" href="<%=request.getContextPath()%>/plugins/bootstrap-daterangepicker/daterangepicker.css"/>
-<script type="text/javascript" src="<%=request.getContextPath()%>/plugins/bootstrap-daterangepicker/moment.min.js" charset="utf-8"></script>
+<script type="text/javascript" src="<%=request.getContextPath()%>/plugins/bootstrap-daterangepicker/moment.min.js"
-<script type="text/javascript" src="<%=request.getContextPath()%>/plugins/bootstrap-daterangepicker/daterangepicker.js" charset="utf-8"></script>
+        charset="utf-8"></script>
+<script type="text/javascript" src="<%=request.getContextPath()%>/plugins/bootstrap-daterangepicker/daterangepicker.js"
+        charset="utf-8"></script>
 <!-- echarts-->
 <script type="text/javascript" src="<%=request.getContextPath()%>/plugins/echarts/echarts.js" charset="utf-8"></script>
 <script type="text/javascript" src="<%=request.getContextPath()%>/plugins/echarts/macarons.js" charset="utf-8"></script>

src/main/webapp/jsp/work/KPIPointProfessorList.jsp

@@ -139,6 +139,34 @@ var companyId = "";
     var dosearch = function() {
         $("#table").bootstrapTable('refresh');
     };
+    var loadProcessSectionSelect = function(companyId) {
+        if (!companyId) {
+            refreshSelect();
+            return;
+        }
+        $.post(ext.contextPath + "/user/processSection/getProcessSection4Select.do", {companyId:companyId}, function(data) {
+           $("#processSection").empty();
+           var selelct_ =$("#processSection").select2({
+                  data: data,
+                  cache : false,
+                  placeholder:'请选择',
+                  allowClear: true,
+                  escapeMarkup: function (markup) { return markup; },
+                  language: "zh-CN",
+                  minimumInputLength: 0,
+                  minimumResultsForSearch: 10,
+                  formatResult: function formatRepo(repo){return repo.text;},
+                  formatSelection: function formatRepoSelection(repo){return repo.text;}
+            });
+           $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'});
+           selelct_.val('').trigger("change.select2");
+           selelct_.off("select2:select select2:clear").on("select2:select select2:clear",function(){
+               setTimeout(function(){
+                   dosearch();
+               },0);
+           });
+       },'json');
+    };
     var refreshSelect = function() {
         var selelct_ =$("#processSection").select2({
             data: null,
@@ -163,27 +191,7 @@ var companyId = "";
   			   $("#company").text(data[0].text);
   			   companyId=data[0].id;
   			   dosearch();
-  		       $.post(ext.contextPath + "/user/processSection/getProcessSection4Select.do", {companyId:companyId}, function(data) {
+    		       loadProcessSectionSelect(companyId);
-                 $("#processSection").empty(); 
-                 var selelct_ =$("#processSection").select2({
-                        data: data,
-                        cache : false,
-                        placeholder:'请选择',//默认文字提示
-                        allowClear: true,//允许清空
-                        escapeMarkup: function (markup) { return markup; }, // 自定义格式化防止xss注入
-                        language: "zh-CN", 
-                        minimumInputLength: 0,
-                        minimumResultsForSearch: 10,//数据超过十个启用搜索框
-                        formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果
-                        formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
-                  });  
-                 $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'})
-                 selelct_.val('').trigger("change");
-                 selelct_.on("change",function(e){
-                     dosearch();
-                 });
-                 
-             },'json'); 
   		   }else{
   			   $("#company").css("display", "none");
   			   var selelct=$("#search_code").select2({
@@ -198,33 +206,14 @@ var companyId = "";
   		          formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
   		        }); 
   		        $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'})
-  		        selelct.val('').trigger("change");
+                selelct.val('').trigger("change.select2");
   		        refreshSelect();
-  		        selelct.on("change",function(e){
+                selelct.off("select2:select select2:clear").on("select2:select select2:clear",function(){
   		            companyId= $(this).val();
   		            dosearch();
   		            refreshSelect();
-  		            $.post(ext.contextPath + "/user/processSection/getProcessSection4Select.do", {companyId:companyId}, function(data) {
+                    loadProcessSectionSelect(companyId);
-  		               $("#processSection").empty(); 
+  		        });
-  		               var selelct_ =$("#processSection").select2({
-  		                      data: data,
-  		                      cache : false,
-  		                      placeholder:'请选择',//默认文字提示
-  		                      allowClear: true,//允许清空
-  		                      escapeMarkup: function (markup) { return markup; }, // 自定义格式化防止xss注入
-  		                      language: "zh-CN", 
-  		                      minimumInputLength: 0,
-  		                      minimumResultsForSearch: 10,//数据超过十个启用搜索框
-  		                      formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果
-  		                      formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
-  		                });  
-  		               $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'})
-  		               selelct_.val('').trigger("change");
-  		               selelct_.on("change",function(e){
-  		                   dosearch();
-  		               });
-  		           },'json');   
-  		        });  
   		   }
          },'json');  
        

src/main/webapp/jsp/work/cameraIdsHisShowlist.jsp

@@ -366,8 +366,8 @@
                             } // 函数用于呈现当前的选择
                         });
                         $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'})
-                        selelct_.val('').trigger("change");
+                        selelct_.val('').trigger("change.select2");
-                        selelct_.on("change", function (e) {
+                        selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) {
                             dosearch();
                         });
                     }, 'json');
@@ -394,9 +394,8 @@
                         } // 函数用于呈现当前的选择
                     });
                     $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'})
-                    selelct.val('').trigger("change");
+                    selelct.val('').trigger("change.select2");
-                    //refreshSelect();
+                    selelct.off("select2:select select2:clear").on("select2:select select2:clear", function (e) {
-                    selelct.on("change", function (e) {
                         companyId = $(this).val();
                         //dosearch();
                         //refreshSelect();
@@ -422,8 +421,8 @@
                                 } // 函数用于呈现当前的选择
                             });
                             $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'})
-                            selelct_.val('').trigger("change");
+                            selelct_.val('').trigger("change.select2");
-                            selelct_.on("change", function (e) {
+                            selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) {
                                 dosearch();
                             });
                         }, 'json');

src/main/webapp/jsp/work/cameraIdsShowlist.jsp

@@ -325,8 +325,8 @@
                             } // 函数用于呈现当前的选择
                         });
                         $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'})
-                        selelct_.val('').trigger("change");
+                        selelct_.val('').trigger("change.select2");
-                        selelct_.on("change", function (e) {
+                        selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) {
                             dosearch();
                         });
                     }, 'json');
@@ -353,9 +353,8 @@
                         } // 函数用于呈现当前的选择
                     });
                     $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'})
-                    selelct.val('').trigger("change");
+                    selelct.val('').trigger("change.select2");
-                    //refreshSelect();
+                    selelct.off("select2:select select2:clear").on("select2:select select2:clear", function (e) {
-                    selelct.on("change", function (e) {
                         companyId = $(this).val();
                         //dosearch();
                         //refreshSelect();
@@ -381,8 +380,8 @@
                                 } // 函数用于呈现当前的选择
                             });
                             $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'})
-                            selelct_.val('').trigger("change");
+                            selelct_.val('').trigger("change.select2");
-                            selelct_.on("change", function (e) {
+                            selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) {
                                 dosearch();
                             });
                         }, 'json');

src/main/webapp/jsp/work/kPointList.jsp

@@ -133,8 +133,8 @@
 				formatSelection: function formatRepoSelection(repo) { return repo.text; } // 函数用于呈现当前的选择
 			});
 			$(".select2-selection--single").css({ 'height': '30px', 'paddingTop': '4px' })
-			selelct_.val('').trigger("change");
+      selelct_.val('').trigger("change.select2");
-			selelct_.on("change", function (e) {
+      selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function () {
 				$("#table").bootstrapTable('refresh');
 			});
 

src/main/webapp/jsp/work/mPointList.jsp

@@ -149,8 +149,8 @@
             minimumInputLength: 0,
             minimumResultsForSearch: 10,//数据超过十个启用搜索框
         });
-        select.val('').trigger("change");
+        select.val('').trigger("change.select2");
-                select.on("change", function (e) {
+                select.off("select2:select select2:clear").on("select2:select select2:clear", function () {
                     $("#table").bootstrapTable('refresh');
                 });
         
@@ -166,8 +166,8 @@
             minimumInputLength: 0,
             minimumResultsForSearch: 10,//数据超过十个启用搜索框
         });
-        select.val("").trigger("change");
+        select.val("").trigger("change.select2");
-                select.on("change", function (e) {
+                select.off("select2:select select2:clear").on("select2:select select2:clear", function () {
                     $("#table").bootstrapTable('refresh');
                 });
         
@@ -196,8 +196,8 @@
                     } // 函数用于呈现当前的选择
                 });
                 $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'})
-                selelct_.val('').trigger("change");
+                selelct_.val('').trigger("change.select2");
-                selelct_.on("change", function (e) {
+                selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function () {
                     $("#table").bootstrapTable('refresh');
                 });
 

src/main/webapp/jsp/work/mPointListES.jsp

@@ -181,8 +181,8 @@
                 minimumInputLength: 0,
                 minimumResultsForSearch: 10,//数据超过十个启用搜索框
             });
-            select.val('').trigger("change");
+            select.val('').trigger("change.select2");
-            select.on("change", function (e) {
+            select.off("select2:select select2:clear").on("select2:select select2:clear", function () {
                 $("#table").bootstrapTable('refresh', {pageNumber: 1});
             });
 
@@ -200,8 +200,8 @@
                 minimumInputLength: 0,
                 minimumResultsForSearch: 10,//数据超过十个启用搜索框
             });
-            select.val("").trigger("change");
+            select.val("").trigger("change.select2");
-            select.on("change", function (e) {
+            select.off("select2:select select2:clear").on("select2:select select2:clear", function () {
                 $("#table").bootstrapTable('refresh', {pageNumber: 1});
             });
 
@@ -231,8 +231,8 @@
                     } // 函数用于呈现当前的选择
                 });
                 $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'})
-                selelct_.val('').trigger("change");
+                selelct_.val('').trigger("change.select2");
-                selelct_.on("change", function (e) {
+                selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function () {
                     $("#table").bootstrapTable('refresh', {pageNumber: 1});
                 });
 

src/main/webapp/jsp/work/schedulingAdd.jsp

@@ -202,9 +202,14 @@
         }, 'json');
 
         //巡检模式
+        var patrolType = '${param.patroltype}';
+        var bizIdForPatrol = '${bizid}';
+        if (!bizIdForPatrol || bizIdForPatrol === '') {
+            bizIdForPatrol = unitId;
+        }
         $.post(ext.contextPath + "/timeEfficiency/patrolModel/getPatrolModelList4Select3.do", {
-            type: '${param.patroltype}',
+            type: patrolType,
-            bizId: unitId
+            bizId: bizIdForPatrol
         }, function (data) {
             var selectpatrolmode_add = $("#schedulingAddModal #patrolmode").select2({
                 data: data,

src/main/webapp/jsp/work/schedulingEdit.jsp

@@ -134,9 +134,14 @@
         }, 'json');
 
         //巡检模式
+        var patrolType = '${param.patroltype}';
+        var bizIdForPatrol = '${bizid}';
+        if (!bizIdForPatrol || bizIdForPatrol === '') {
+            bizIdForPatrol = unitId;
+        }
         $.post(ext.contextPath + "/timeEfficiency/patrolModel/getPatrolModelList4Select3.do", {
-            type: '${param.patroltype}',
+            type: patrolType,
-            bizId: unitId
+            bizId: bizIdForPatrol
         }, function (data) {
             var selectpatrolmode_edit = $("#schedulingEditModal #patrolmode").select2({
                 data: data,

src/main/webapp/jsp/work/schedulingHandoverList.jsp

@@ -8,15 +8,16 @@
 
 <script type="text/javascript">
     var date = "${date}";
+    var bizid = "${param.bizid}";
     var addFun = function () {
-        $.post(ext.contextPath + '/work/scheduling/add.do', { date: date },
+        $.post(ext.contextPath + '/work/scheduling/add.do', { date: date, bizid: bizid },
             function (data) {
                 $("#addDiv").html(data);
                 openModal('schedulingAddModal');
             });
     };
     var viewFun = function (id) {
-        $.post(ext.contextPath + '/work/scheduling/view.do', { id: id }, function (data) {
+        $.post(ext.contextPath + '/work/scheduling/view.do', { id: id, bizid: bizid }, function (data) {
             $("#viewDiv").html(data);
             openModal('schedulingEditModal');
         });

src/main/webapp/jsp/workorder/overHaulRecordAdd.jsp

@@ -108,7 +108,7 @@
                         formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
                   });  
                  if(data!=null && data.length>0){
-                     selelct_.val(data[0].id).trigger("change");
+                     selelct_.val(data[0].id).trigger("change.select2");
                  }
              },'json'); 
   		   }else{
@@ -126,7 +126,7 @@
 	                  formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果
 	                  formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
 	            }); 
-  		    	selelct.on("change",function(e){
+              selelct.off("select2:select select2:clear").on("select2:select select2:clear",function(){
   		            companyId= $(this).val();
   		            //重新选择厂区后清空设备和工艺段数据
   		            $("#equipname").val("");
@@ -134,7 +134,7 @@
   		            $("#processSectionId").val("");
   		            $("#processectionname").val("");
   		    	});
-	            selelct.val('').trigger("change");
+	            selelct.val('').trigger("change.select2");
   		   }
          },'json');  
         
@@ -149,9 +149,9 @@
                 .updateStatus('plannedenddt', 'NOT_VALIDATED',null)
                 .validateField('plannedenddt');
         });
-        $("#active").select2({minimumResultsForSearch: 10}).val('${Active_True}').trigger("change");
+        $("#active").select2({minimumResultsForSearch: 10}).val('${Active_True}').trigger("change.select2");
-        $("#maintenanceWay").select2({minimumResultsForSearch: 10}).val('${INTER_MAINTENANCE}').trigger("change");
+        $("#maintenanceWay").select2({minimumResultsForSearch: 10}).val('${INTER_MAINTENANCE}').trigger("change.select2");
-    });	
+    });
 	//选择设备，根据厂区id选择厂内设备
 	var selectEquipmentCard = function() {
         $.post(ext.contextPath + '/equipment/showEquipmentCardForSelect.do', {companyId:companyId, equipmentId:$("#equipid").val()} , function(data) {

src/main/webapp/jsp/workorder/overHaulRecordEdit.jsp

@@ -101,7 +101,7 @@
                         formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
                   });  
                  if(data!=null && data.length>0){
-                     selelct_.val(data[0].id).trigger("change");
+                     selelct_.val(data[0].id).trigger("change.select2");
                  }
              },'json'); 
   		   }else{
@@ -119,7 +119,7 @@
 	                  formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
 	            }); 
   		    	
-  		    	selelct.on("change",function(e){
+  		    	selelct.off("select2:select select2:clear").on("select2:select select2:clear", function(e){
   		            companyId = $(this).val();
   		            //重新选择厂区后清空设备和工艺段数据
   		           if(companyId != "${maintenanceDetail.companyid}"){
@@ -129,10 +129,10 @@
  		             $("#processectionname").val("");  
   		           }
   		    	});
-	            selelct.val('${maintenanceDetail.companyid}').trigger("change");
+	            selelct.val('${maintenanceDetail.companyid}').trigger("change.select2");
   		   }
          },'json');  
-   	    $("#maintenanceWay").select2({minimumResultsForSearch: 10}).val("${maintenanceDetail.maintenanceWay}").trigger("change"); 
+   	    $("#maintenanceWay").select2({minimumResultsForSearch: 10}).val("${maintenanceDetail.maintenanceWay}").trigger("change.select2");
    	    //选择时间
         $('#startDate').datepicker({
             language: 'zh-CN',

src/main/webapp/jsp/workorder/overHaulRecordList.jsp

@@ -133,8 +133,8 @@
 	                        formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
 	                  });  
 	                 $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'})
-	                 selelct_.val('').trigger("change");
+	                 selelct_.val('').trigger("change.select2");
-	                 selelct_.on("change",function(e){
+	                 selelct_.off("select2:select select2:clear").on("select2:select select2:clear",function(){
 	                     dosearch();
 	                 });
 	                 
@@ -153,9 +153,9 @@
 	  		          formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
 	  		        }); 
 	  		        $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'})
-	  		        selelct.val('').trigger("change");
+	  		        selelct.val('').trigger("change.select2");
 	  		        refreshSelect();
-	  		        selelct.on("change",function(e){
+								        selelct.off("select2:select select2:clear").on("select2:select select2:clear",function(){
 	  		            companyId= $(this).val();
 	  		            dosearch();
 	  		            refreshSelect();
@@ -174,8 +174,8 @@
 	  		                      formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
 	  		                });  
 	  		               $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'})
-	  		               selelct_.val('').trigger("change");
+	  		               selelct_.val('').trigger("change.select2");
-	  		               selelct_.on("change",function(e){
+								               selelct_.off("select2:select select2:clear").on("select2:select select2:clear",function(){
 	  		                   dosearch();
 	  		               });
 	  		           },'json');   

src/main/webapp/jsp/workorder/workorderDetailEndMaintainList.jsp

@@ -418,17 +418,12 @@
 
         var getExs = function () {
             var datas = selectionIds.toString();
-            if (datas === "") {
+            var params = {
-                showAlert('d', '请选中之后导出', 'mainAlertdiv');
+                responseType: 'blob',
-            } else {
+                ids: datas,
-                // window.open(ext.contextPath + "/workorder/workorderDetail/doExportMain.do?ids=" + datas + "&type=maintain");
+                type: 'maintain'
-                var params = {
+            };
-                    responseType: 'blob',
+            postExcelFile(params, ext.contextPath + '/workorder/workorderDetail/doExportMain.do');
-                    ids: datas,
-                    type: 'maintain'
-                };
-                postExcelFile(params, ext.contextPath + '/workorder/workorderDetail/doExportMain.do');
-            }
         }
 
         function postExcelFile(params, url) { //params是post请求需要的参数，url是请求url地址

src/main/webapp/jsp/workorder/workorderDetailEndRepairList.jsp

@@ -117,11 +117,7 @@
         //金山项目导出（暂时不用）
         var getExs_JS = function () {
             var datas = selectionIds;
-            if (datas == 0) {
+            window.open(ext.contextPath + "/workorder/workorderDetail/doExportRepairJS.do?ids=" + datas + "&type=repair");
-                showAlert('d', '请选中之后导出', 'mainAlertdiv');
-            } else {
-                window.open(ext.contextPath + "/workorder/workorderDetail/doExportRepairJS.do?ids=" + datas + "&type=repair");
-            }
         }
 
         /**
@@ -129,16 +125,12 @@
          */
         var getExs = function () {
             var datas = selectionIds;
-            if (datas == 0) {
+            var params = {
-                showAlert('d', '请选中之后导出', 'mainAlertdiv');
+                responseType: 'blob',
-            } else {
+                ids: datas,
-                var params = {
+                type: 'repair'
-                    responseType: 'blob',
+            };
-                    ids: datas,
+            postExcelFile(params, ext.contextPath + '/workorder/workorderDetail/doExportRepair.do');
-                    type: 'repair'
-                };
-                postExcelFile(params, ext.contextPath + '/workorder/workorderDetail/doExportRepair.do');
-            }
         }
 
         function postExcelFile(params, url) { //params是post请求需要的参数，url是请求url地址