add:合并线上代码

src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java

@@ -827,13 +827,18 @@ public class AppHotWorkApplicationController extends BaseController {
 				return map;
 			}
 		} else {
-			hotUserList = hotWorkApplicationUserService.listByDepartment(hotUserPd); // 找到这一笔的审批人们
+			//先判断延时监火是否为选择部门
+			hotUserList = hotWorkApplicationUserService.listByDepartment(hotUserPd); // 找到这一笔的审批人们（选择部门）
 			if (hotUserList.size() < 1) {
+				//如果查询部门查不到就根据人查询
+				hotUserList = hotWorkApplicationUserService.listAll(hotUserPd); // 找到这一笔的审批人（选择人）
+				if (hotUserList.size() != 1) {
 					map.put("result", "error");
 					map.put("msg", "获取审批人意见失败！请联系管理员");
 					return map;
 				}
 			}
+		}
 
 
 		PageData  hotUser = hotUserList.get(0);

src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java

@@ -69,38 +69,38 @@ public class AppHotWorkApplicationDelayedController extends BaseController {
 				map.put("msg", "文件格式不正确！");
 				return map;
 			}
-			Image srcImg = ImageIO.read(file.getInputStream());
+//			Image srcImg = ImageIO.read(file.getInputStream());
-			//获取图片的宽
+//			//获取图片的宽
-			int srcImgWidth = srcImg.getWidth(null);
+//			int srcImgWidth = srcImg.getWidth(null);
-			//获取图片的高
+//			//获取图片的高
-			int srcImgHeight = srcImg.getHeight(null);
+//			int srcImgHeight = srcImg.getHeight(null);
-
+//
-			BufferedImage bufImg = new BufferedImage(srcImgWidth, srcImgHeight, BufferedImage.TYPE_INT_RGB);
+//			BufferedImage bufImg = new BufferedImage(srcImgWidth, srcImgHeight, BufferedImage.TYPE_INT_RGB);
-			// 加水印
+//			// 加水印
-			//创建画笔
+//			//创建画笔
-			Graphics2D g = bufImg.createGraphics();
+//			Graphics2D g = bufImg.createGraphics();
-			//srcImg 为上面获取到的原始图片的图片对象
+//			//srcImg 为上面获取到的原始图片的图片对象
-			g.drawImage(srcImg, 0, 0, srcImgWidth, srcImgHeight, null);
+//			g.drawImage(srcImg, 0, 0, srcImgWidth, srcImgHeight, null);
-			//根据图片的背景设置水印颜色
+//			//根据图片的背景设置水印颜色
-			g.setColor(new Color(255,255,255,128));
+//			g.setColor(new Color(255,255,255,128));
-			//设置字体  画笔字体样式为微软雅黑，加粗，文字大小为60pt
+//			//设置字体  画笔字体样式为微软雅黑，加粗，文字大小为60pt
-			g.setFont(new Font("微软雅黑", Font.BOLD, 20));
+//			g.setFont(new Font("微软雅黑", Font.BOLD, 20));
-			//设置水印的坐标
+//			//设置水印的坐标
-			int x=(srcImgWidth - WaterMarkUtil.getWatermarkLength(DateUtil.date2Str(new Date()), g)) / 2;
+//			int x=(srcImgWidth - WaterMarkUtil.getWatermarkLength(DateUtil.date2Str(new Date()), g)) / 2;
-			int y=srcImgHeight / 2;
+//			int y=srcImgHeight / 2;
-			//画出水印 第一个参数是水印内容，第二个参数是x轴坐标，第三个参数是y轴坐标
+//			//画出水印 第一个参数是水印内容，第二个参数是x轴坐标，第三个参数是y轴坐标
-			g.drawString(DateUtil.date2Str(new Date()), x, y);
+//			g.drawString(DateUtil.date2Str(new Date()), x, y);
-			g.dispose();
+//			g.dispose();
-			//将加完水印的图片暂存到内存中
+//			//将加完水印的图片暂存到内存中
-			ByteArrayOutputStream bos = new ByteArrayOutputStream();
+//			ByteArrayOutputStream bos = new ByteArrayOutputStream();
-			ImageIO.write(bufImg, suffixName, bos);
+//			ImageIO.write(bufImg, suffixName, bos);
-			ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+//			ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
-
+//
 			String  ffile = DateUtil.getDays();
 			String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
-//			Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + corpInfoId + "/" + ffile);
+			Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + corpInfoId + "/" + ffile);
 //			通过流的方式上传文件
-			Smb.sshSftpForInput(bis, fileName, Const.FILEPATHYHTP + corpInfoId + "/" + ffile);
+//			Smb.sshSftpForInput(bis, fileName, Const.FILEPATHYHTP + corpInfoId + "/" + ffile);
 			pd.put("FILEPATH",Const.FILEPATHYHTP + corpInfoId + "/" + ffile + "/" + fileName);
 		}
 		hotworkapplicationdelayedService.save(pd);

src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java

@@ -1310,7 +1310,8 @@ public class HotWorkApplicationController extends BaseController {
 				}else if("2".equals(type)){ // 项目发包单位负责人
 					hot.put("PROJECT_UNIT_LEADER_NAME",userPageData.getString("userName"));
 					hot.put("PROJECT_UNIT_LEADER_ID",userPageData.getString("USER_ID"));
-				}else if("4".equals(type)){ // 现场管辖单位负责人
+//				}else if("4".equals(type)){ // 现场管辖单位负责人
+				}else if("3".equals(type)){ // 现场管辖单位负责人
 					hot.put("UNIT_LEADER_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID"));
 					hot.put("UNIT_LEADER_DEPARTMENT_NAME",userPageData.getString("deptName"));
 					hot.put("UNIT_LEADER_NAME",userPageData.getString("userName"));

src/main/java/com/zcloud/controller/bus/RiskWarningController.java

@@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.alibaba.fastjson.JSON;
 import com.zcloud.aspect.DockAnnotation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -43,6 +44,9 @@ import com.zcloud.service.bus.RiskWarningService;
 @RequestMapping("/riskwarning")
 public class RiskWarningController extends BaseController {
 
+	@Value("${http.file.url}")
+	private String fileUrl;
+
 	@Autowired
 	private RiskWarningService riskwarningService;
 
@@ -205,7 +209,7 @@ public class RiskWarningController extends BaseController {
 		pd = riskwarningService.findById(pd);
 		String FILEPATH = pd.get("FILEPATH").toString();
 		System.out.println(FILEPATH.length());
-		FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILEPATH.substring(FILEPATH.length()<85?28:61, FILEPATH.length()));
+		FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILEPATH.substring(FILEPATH.length()<85?28:61, FILEPATH.length()));
 	}
 	 /**导出到excel
 	 * @param

src/main/java/com/zcloud/controller/bus/VideoController.java

@@ -9,6 +9,7 @@ import java.util.Map;
 import com.zcloud.aspect.DockAnnotation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -39,6 +40,10 @@ import com.zcloud.util.Tools;
 @RequestMapping("/video")
 public class VideoController extends BaseController {
 
+	@Value("${http.file.url}")
+	private String fileUrl;
+
+
 	@Autowired
 	private VideoService videoService;
 
@@ -49,7 +54,6 @@ public class VideoController extends BaseController {
 	@RequestMapping(value="/add")
 	@RequiresPermissions("video:add")
 	@ResponseBody
-	@DockAnnotation(hasAnnex = true)
 	public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
@@ -77,8 +81,8 @@ public class VideoController extends BaseController {
     		String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
 		 	//Smb.1sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
 			//pd.put("FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
-			Smb.sshSftp(file, fileName,Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
+			Smb.sshSftp(file, fileName,fileUrl + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
-			pd.put("FILEPATH", Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
+			pd.put("FILEPATH", fileUrl + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
 			fileList.add(Const.HTTPFILEURL + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName);
 		}
 
@@ -160,7 +164,6 @@ public class VideoController extends BaseController {
 	@RequestMapping(value="/goEdit")
 	@RequiresPermissions("video:edit")
 	@ResponseBody
-	@DockAnnotation
 	public Object goEdit() throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";

src/main/java/com/zcloud/controller/emergency/EmergencyDrillAttachmentController.java

@@ -7,6 +7,7 @@ import com.zcloud.service.emergency.EmergencyDrillAttachmentService;
 import com.zcloud.util.*;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -27,6 +28,9 @@ import java.util.*;
 @RequestMapping("/emergencydrillattachment")
 public class EmergencyDrillAttachmentController extends BaseController {
 
+	@Value("${http.file.url}")
+	private String fileUrl;
+
 	@Autowired
 	private EmergencyDrillAttachmentService emergencydrillattachmentService;
 
@@ -256,7 +260,7 @@ public class EmergencyDrillAttachmentController extends BaseController {
 //			FileDownload.fileDownload(response, PathUtil.getProjectpath() + FILEPATH, FILENAME);
 ////			FileDownload.mfFileDownload(response, this.getRequest().getScheme() + "://" + this.getRequest().getServerName() + ":" + this.getRequest().getServerPort() + FILEPATH, FILENAME);	//不好用
 			//服务器
-			FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME);
+			FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME);
 		} catch (Exception e) {
 			e.printStackTrace();
 			throw new Exception("=========文件下载异常：可能要下载的文件已经没有了=========");

src/main/java/com/zcloud/controller/emergency/EmergencyDrillReportController.java

@@ -7,6 +7,7 @@ import com.zcloud.service.emergency.EmergencyDrillReportService;
 import com.zcloud.util.*;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -27,6 +28,9 @@ import java.util.*;
 @RequestMapping("/emergencydrillreport")
 public class EmergencyDrillReportController extends BaseController {
 
+	@Value("${http.file.url}")
+	private String fileUrl;
+
 	@Autowired
 	private EmergencyDrillReportService emergencydrillreportService;
 
@@ -258,7 +262,7 @@ public class EmergencyDrillReportController extends BaseController {
 //			FileDownload.fileDownload(response, PathUtil.getProjectpath() + FILEPATH, FILENAME);
 ////			FileDownload.mfFileDownload(response, this.getRequest().getScheme() + "://" + this.getRequest().getServerName() + ":" + this.getRequest().getServerPort() + FILEPATH, FILENAME);	//不好用
 			//服务器
-			FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME);
+			FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME);
 		} catch (Exception e) {
 			e.printStackTrace();
 			throw new Exception("=========文件下载异常：可能要下载的文件已经没有了=========");

src/main/java/com/zcloud/controller/emergency/EmergencyPlanController.java

@@ -7,6 +7,7 @@ import com.zcloud.service.emergency.EmergencyPlanService;
 import com.zcloud.util.*;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -27,6 +28,9 @@ import java.util.*;
 @RequestMapping("/emergencyplan")
 public class EmergencyPlanController extends BaseController {
 
+	@Value("${http.file.url}")
+	private String fileUrl;
+
 	@Autowired
 	private EmergencyPlanService emergencyplanService;
 
@@ -283,7 +287,7 @@ public class EmergencyPlanController extends BaseController {
 //			FileDownload.fileDownload(response, PathUtil.getProjectpath() + FILEPATH, FILENAME);
 ////			FileDownload.mfFileDownload(response, this.getRequest().getScheme() + "://" + this.getRequest().getServerName() + ":" + this.getRequest().getServerPort() + FILEPATH, FILENAME);	//不好用
 			//服务器
-			FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME);
+			FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME);
 		} catch (Exception e) {
 			e.printStackTrace();
 			throw new Exception("=========文件下载异常：可能要下载的文件已经没有了=========");

src/main/java/com/zcloud/controller/home/HomeHighRiskWorkController.java

@@ -11,6 +11,7 @@ import com.zcloud.service.system.DepartmentService;
 import com.zcloud.service.system.DictionariesService;
 import com.zcloud.service.system.UsersService;
 import com.zcloud.util.Jurisdiction;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -48,7 +49,12 @@ public class HomeHighRiskWorkController extends BaseController {
 
 		/*风险管控 数据统计*/
 		//获取高危作业统计数据（申请数[COUNTAPPLY]，审批中[COUNTAPPROVE]，归档[COUNTARCHIVE]）
-		PageData data = highworkService.statisticsHighRiskWorkByState(pd);
+		PageData data = new PageData();
+		if (StringUtils.equals("035958e685cf4850bc40151c5e0617a6",pd.getString("CORPINFO_ID"))) { //一公司
+			data = highworkService.statisticsHighRiskWorkByStateFirst(pd);
+		} else {
+			data = highworkService.statisticsHighRiskWorkByState(pd);
+		}
 		map.put("pd", data);
 
 		map.put("result", errInfo);
@@ -70,7 +76,12 @@ public class HomeHighRiskWorkController extends BaseController {
 		pd = this.getPageData();
 		pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业
 		page.setPd(pd);
-		List<PageData> varList = highworkService.listHighRiskWork(page);
+		List<PageData> varList = new ArrayList<>();
+		if (StringUtils.equals("035958e685cf4850bc40151c5e0617a6",pd.getString("CORPINFO_ID"))) { // 一公司
+			varList = highworkService.listHighRiskWorkFirst(page);
+		} else {
+			varList = highworkService.listHighRiskWork(page);
+		}
 		map.put("varList", varList);
 		map.put("result", errInfo);
 		return map;
@@ -93,7 +104,12 @@ public class HomeHighRiskWorkController extends BaseController {
 		Map<String, Object> chartData = new HashMap<String, Object>();
 		List<String> legendData = Arrays.asList(new String[]{"动火作业", "临时用电作业", "盲板作业", "高处作业", "有限空间作业", "吊装作业"});
 
-		List<PageData> workChart = highworkService.statisticsAllHighRiskWork(pd);	//统计高危作业里各作业数
+		List<PageData> workChart = new ArrayList<>();
+		if (StringUtils.equals("035958e685cf4850bc40151c5e0617a6",pd.getString("CORPINFO_ID"))) { //一公司
+			workChart = highworkService.statisticsAllHighRiskWorkFirst(pd); //统计高危作业里各作业数
+		} else {
+			workChart = highworkService.statisticsAllHighRiskWork(pd);	//统计高危作业里各作业数
+		}
 		List seriesData = new ArrayList();
 		for (int i = 0; i < legendData.size(); i++) {
 			PageData pie = new PageData();

src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java

@@ -21,6 +21,7 @@ import com.zcloud.util.*;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -41,6 +42,9 @@ import java.util.*;
 @RequestMapping("/safetyenvironmental")
 public class SafetyEnvironmentalController extends BaseController {
 
+    @Value("${http.file.url}")
+    private String fileUrl;
+
     @Autowired
     private SafetyEnvironmentalService safetyenvironmentalService;
     @Autowired
@@ -659,7 +663,7 @@ public class SafetyEnvironmentalController extends BaseController {
             String FILEPATH = pd.getString("INSPECTED_EXPLAIN_FILEPATH");
             String FILENAME = pd.getString("INSPECTED_EXPLAIN_FILENAME");
             //服务器
-            FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME);
+            FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME);
         } catch (Exception e) {
             e.printStackTrace();
             throw new Exception("=========文件下载异常：可能要下载的文件已经没有了=========");
@@ -680,7 +684,7 @@ public class SafetyEnvironmentalController extends BaseController {
             String FILEPATH = pd.getString("INSPECTED_EXPLAIN_FILEPATH");
             String FILENAME = pd.getString("INSPECTED_EXPLAIN_FILENAME");
             //服务器
-            FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME);
+            FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME);
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java

@@ -8,6 +8,7 @@ import com.zcloud.util.Tools;
 import com.zcloud.util.hk.HKUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -54,6 +55,9 @@ public class PlatformvideomanagementController extends BaseController {
 		Map<String,Object> map = new HashMap<String,Object>();
 		PageData pd =this.getPageData();
 		map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"hls");
+		if(!ObjectUtils.isEmpty(map)){
+			map = new HashMap<String,Object>();
+		}
 		map.put("result", "success");
 		return map;
 	}
@@ -67,6 +71,9 @@ public class PlatformvideomanagementController extends BaseController {
 		Map<String,Object> map = new HashMap<String,Object>();
 		PageData pd =this.getPageData();
 		map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"rtsp");
+		if(!ObjectUtils.isEmpty(map)){
+			map = new HashMap<String,Object>();
+		}
 		map.put("result", "success");
 		return map;
 	}
@@ -80,6 +87,9 @@ public class PlatformvideomanagementController extends BaseController {
 		Map<String,Object> map = new HashMap<String,Object>();
 		PageData pd =this.getPageData();
 		map = HKUtil.cameraSearch(pd);
+		if(!ObjectUtils.isEmpty(map)){
+			map = new HashMap<String,Object>();
+		}
 		map.put("result", "success");
 		return map;
 	}

src/main/java/com/zcloud/controller/keyProjects/app/AppKeyProjectsController.java

@@ -6,6 +6,7 @@ import com.zcloud.entity.PageData;
 import com.zcloud.service.keyProjects.OutSourcedService;
 import com.zcloud.service.keyProjects.PersonnelManagementService;
 import com.zcloud.service.keyProjects.UnitsService;
+import com.zcloud.service.keyProjects.VideoManagerService;
 import com.zcloud.service.system.DictionariesService;
 import com.zcloud.util.Jurisdiction;
 import com.zcloud.util.Tools;
@@ -38,6 +39,9 @@ public class AppKeyProjectsController extends BaseController {
 	@Autowired
 	private PersonnelManagementService personnelmanagementService;
 
+	@Autowired
+	private VideoManagerService videomanagerService;
+
 	/**列表
 	 * @throws Exception
 	 */
@@ -156,4 +160,127 @@ public class AppKeyProjectsController extends BaseController {
 		map.put("result", errInfo);
 		return map;
 	}
+
+
+	/** 隐患列表  查询进行中的重点工程以及排序
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/listHiddenOutsourced")
+	@ResponseBody
+	public Object listHiddenOutsourced(Page page) throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		String KEYWORDS = pd.getString("KEYWORDS");						//关键词检索条件
+		if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
+		String UserId = pd.getString("UserId");
+		if(!StringUtils.equals("1",UserId)){
+			String CORPINFO_ID = pd.getString("CORPINFO_ID");
+//			-- 河港机械 河港港工 河港检测
+			if(!StringUtils.equals(CORPINFO_ID,"1e6dbbe16004402f8d2c0e52afd9a676")
+					&&!StringUtils.equals(CORPINFO_ID,"3a854eefa7894e06aaa1a2611bca80f6")&&
+					!StringUtils.equals(CORPINFO_ID,"020578a4c1f04bc692ee25145c2efbe5")
+					&&!StringUtils.equals(CORPINFO_ID,"90966974de3c4b83aca6f8fd6432d5c2")){
+				pd.put("DeptId",outsourcedService.getDeptId(UserId));
+				pd.put("UserId",UserId);
+
+			}
+		}
+		page.setPd(pd);
+		List<PageData>	varList = outsourcedService.listHiddenOutsourced(page);	//列出OutSourced列表
+		map.put("varList", varList);
+		map.put("page", page);
+		map.put("result", errInfo);
+		return map;
+	}
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/videomanagerList")
+	@ResponseBody
+	public Object list(Page page) throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		page.setPd(pd);
+		List<PageData>	varList = videomanagerService.listApp(page);	//列出VideoManager列表
+		map.put("varList", varList);
+		map.put("page", page);
+		map.put("result", errInfo);
+		return map;
+	}
+
+
+	/**去修改页面获取数据
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/getOutsourced")
+	@ResponseBody
+	public Object getOutsourced() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd = outsourcedService.findById(pd);	//根据ID读取
+		map.put("pd", pd);
+		map.put("result", errInfo);
+		return map;
+	}
+
+	/** 修改工程状态
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/updateState")
+	@ResponseBody
+	public Object updateState() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		outsourcedService.updateState(pd);	//获取同时绑定的重点工程信息如果大于1表示还有其他重点工程
+		map.put("result", errInfo);
+		return map;
+	}
+
+	/**列表
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/outSouceslistPage")
+	@ResponseBody
+	public Object outSouceslistPage(Page page) throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		String KEYWORDS = pd.getString("KEYWORDS");						//关键词检索条件
+		if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
+		String UserId = pd.getString("UserId");
+		if(!StringUtils.equals("1",UserId)){
+			String CORPINFO_ID = pd.getString("CORPINFO_ID");
+//			-- 河港机械 河港港工 河港检测
+			if(!StringUtils.equals(CORPINFO_ID,"1e6dbbe16004402f8d2c0e52afd9a676")
+					&&!StringUtils.equals(CORPINFO_ID,"3a854eefa7894e06aaa1a2611bca80f6")&&
+					!StringUtils.equals(CORPINFO_ID,"020578a4c1f04bc692ee25145c2efbe5")
+					&&!StringUtils.equals(CORPINFO_ID,"90966974de3c4b83aca6f8fd6432d5c2")){
+				pd.put("DeptId",outsourcedService.getDeptId(UserId));
+				pd.put("UserId",UserId);
+
+			}
+		}
+		page.setPd(pd);
+		List<PageData>	varList = outsourcedService.outSouceslistPage(page);	//列出OutSourced列表
+		map.put("varList", varList);
+		map.put("page", page);
+		map.put("result", errInfo);
+		return map;
+	}
+
+
+
 }

src/main/java/com/zcloud/controller/majordangersource/MajorDangerSourceController.java

@@ -10,6 +10,7 @@ import com.zcloud.service.majordangersource.MajorDangerSourceLogService;
 import com.zcloud.service.majordangersource.MonitoringDeviceDisableService;
 import com.zcloud.util.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -35,6 +36,9 @@ import javax.servlet.http.HttpServletResponse;
 @RequestMapping("/majordangersource")
 public class MajorDangerSourceController extends BaseController {
 
+	@Value("${http.file.url}")
+	private String fileUrl;
+
 	@Autowired
 	private MajorDangerSourceService majordangersourceService;
 
@@ -352,7 +356,7 @@ public class MajorDangerSourceController extends BaseController {
 //			FileDownload.fileDownload(response, PathUtil.getProjectpath() + FILEPATH, FILENAME);
 ////			FileDownload.mfFileDownload(response, this.getRequest().getScheme() + "://" + this.getRequest().getServerName() + ":" + this.getRequest().getServerPort() + FILEPATH, FILENAME);	//不好用
 			//服务器
-			FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME);
+			FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME);
 		} catch (Exception e) {
 			e.printStackTrace();
 			throw new Exception("=========文件下载异常：可能要下载的文件已经没有了=========");

src/main/java/com/zcloud/controller/majordangersource/MajorDangerSourceLogController.java

@@ -7,6 +7,7 @@ import com.zcloud.service.majordangersource.MajorDangerSourceLogService;
 import com.zcloud.util.*;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -25,6 +26,9 @@ import java.util.*;
 @RequestMapping("/majordangersourcelog")
 public class MajorDangerSourceLogController extends BaseController {
 
+	@Value("${http.file.url}")
+	private String fileUrl;
+
 	@Autowired
 	private MajorDangerSourceLogService majorDangerSourceLogService;
 
@@ -267,7 +271,7 @@ public class MajorDangerSourceLogController extends BaseController {
 //			FileDownload.fileDownload(response, PathUtil.getProjectpath() + FILEPATH, FILENAME);
 ////			FileDownload.mfFileDownload(response, this.getRequest().getScheme() + "://" + this.getRequest().getServerName() + ":" + this.getRequest().getServerPort() + FILEPATH, FILENAME);	//不好用
 			//服务器
-			FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME);
+			FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME);
 		} catch (Exception e) {
 			e.printStackTrace();
 			throw new Exception("=========文件下载异常：可能要下载的文件已经没有了=========");

src/main/java/com/zcloud/controller/openApi/OpenApiController.java

@@ -66,6 +66,23 @@ public class OpenApiController extends BaseController {
         return map;
     }
 
+    /**
+     * 显示列表ztree
+     * @return
+     */
+    @RequestMapping(value="/corpDepartment/listTree")
+    @ResponseBody
+    public Object listTreeRe()throws Exception{
+        Map<String,Object> map = new HashMap<String,Object>();
+        String errInfo = "success";
+        JSONArray arr = JSONArray.fromObject(departmentService.listAllCorpDepartment("0"));
+        String json = arr.toString();
+        json = json.replaceAll("DEPARTMENT_ID", "id").replaceAll("PARENT_ID", "pId").replaceAll("NAME", "name").replaceAll("subDepartment", "nodes").replaceAll("hasDepartment", "checked").replaceAll("treeurl", "url");
+        map.put("zTreeNodes", json);
+        map.put("result", errInfo);
+        return map;
+    }
+
     /**列表
      * @throws Exception
      */

src/main/java/com/zcloud/controller/system/LoginController.java

@@ -70,19 +70,22 @@ public class LoginController extends BaseController {
 
     @Autowired
     private PhotoService photoService;
-    @Value("${czks-useridentity}")
+//    @Value("${czks-useridentity}")
-    private String czksIdentity;
+//    private String czksIdentity;
-    @Value("${czks-baseimgpath}")
+//    @Value("${czks-baseimgpath}")
-    private String czksBaseimgpath;
+//    private String czksBaseimgpath;
-    @Value("${czks-backendaddr}")
+//    @Value("${czks-backendaddr}")
-    private String czksBackendaddr;
+//    private String czksBackendaddr;
+//
+//    @Value("${gwj-useridentity}")
+//    private String gwjIdentity;
+//    @Value("${gwj-baseimgpath}")
+//    private String gwjBaseimgpath;
+//    @Value("${gwj-backendaddr}")
+//    private String gwjBackendaddr;
+    @Autowired
+    private CorpPathService corpPathService;
 
-    @Value("${gwj-useridentity}")
-    private String gwjIdentity;
-    @Value("${gwj-baseimgpath}")
-    private String gwjBaseimgpath;
-    @Value("${gwj-backendaddr}")
-    private String gwjBackendaddr;
     /**
      * 请求登录验证用户接口
      *
@@ -284,6 +287,19 @@ public class LoginController extends BaseController {
                                     session.setAttribute(Const.ISSUPERVISE, dpd.getString("ISSUPERVISE"));        //把当前用户放入session
 
                                     FHLOG.save(USERNAME, "成功登录系统", ip);                //记录日志
+
+                                    //查询该用户或企业的图片和后端地址
+                                    if (!Tools.isEmpty(pd.getString("CORPINFO_ID")) && !pd.getString("CORPINFO_ID").equals("1")) {
+                                        PageData pathData = corpPathService.getCorpPathByCorpId(pd);
+                                        map.put("baseImgPath",pathData.getString("PIC_PATH"));
+                                        map.put("USER_IDENTITY",pathData.getString("USER_IDENTITY"));
+                                        map.put("BACKENDADDR", pathData.getString("BACK_END_PATH"));
+                                    } else {
+                                        PageData pathData = corpPathService.getCorpPathByPersonInfo(pd);
+                                        map.put("baseImgPath",pathData.getString("PIC_PATH"));
+                                        map.put("USER_IDENTITY",pathData.getString("USER_IDENTITY"));
+                                        map.put("BACKENDADDR", pathData.getString("BACK_END_PATH"));
+                                    }
                                 }
                             } else {
                                 token.clear();

src/main/java/com/zcloud/controller/system/UsersController.java

@@ -2408,5 +2408,22 @@ public class UsersController extends BaseController {
         map.put("result", errInfo);
         return map;
     }
+    /**
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value = "/getRegUserInfo")
+    @ResponseBody
+    public Object getRegUserInfo() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        pd.put("LOCK_STATUS", "0");
+        pd.put("ERROR_COUNT", 0);
+        map.put("list",usersService.getRegUserInfo(pd));
+        map.put("result", errInfo);
+        return map;
+    }
 
 }

src/main/java/com/zcloud/controller/tzsb/SpecialEquipmentController.java

@@ -13,6 +13,7 @@ import com.zcloud.service.tzsb.SpecialEquipmentService;
 import com.zcloud.util.*;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -33,6 +34,9 @@ import java.util.*;
 @RequestMapping("/specialequipment")
 public class SpecialEquipmentController extends BaseController {
 
+	@Value("${http.file.url}")
+	private String fileUrl;
+
 	@Autowired
 	private SpecialEquipmentService specialequipmentService;
 	@Autowired
@@ -515,7 +519,7 @@ public class SpecialEquipmentController extends BaseController {
 //			FileDownload.fileDownload(response, PathUtil.getProjectpath() + FILEPATH, FILENAME);
 ////			FileDownload.mfFileDownload(response, this.getRequest().getScheme() + "://" + this.getRequest().getServerName() + ":" + this.getRequest().getServerPort() + FILEPATH, FILENAME);	//不好用
 			//服务器
-			FileDownload.mfFileDownload(response, Const.HTTPFILEURL + FILEPATH, FILENAME);
+			FileDownload.mfFileDownload(response, fileUrl + FILEPATH, FILENAME);
 		} catch (Exception e) {
 			e.printStackTrace();
 			throw new Exception("=========文件下载异常：可能要下载的文件已经没有了=========");

src/main/java/com/zcloud/controller/xgf/FlowTrainController.java

@@ -3,15 +3,18 @@ package com.zcloud.controller.xgf;
 import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
-import com.zcloud.util.Const;
+import com.zcloud.service.xgf.TrainUsersService;
-import com.zcloud.util.HttpClientService;
+import com.zcloud.service.xgf.TrainingBatchService;
-import com.zcloud.util.Jurisdiction;
+import com.zcloud.util.*;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,23 +28,43 @@ public class FlowTrainController extends BaseController {
     @Value("${preventionxgf.api.url}")
     private String xgfUrl;
 
+    @Resource
+    private TrainingBatchService trainingbatchService;
+
+    @Resource
+    private TrainUsersService trainUsersService;
+
     @RequestMapping(value = "/batchList")
     @ResponseBody
     public Object batchList(Page page) throws Exception {
-        PageData pd = new PageData();
+        Map<String, Object> map = new HashMap<String, Object>();
-        pd = this.getPageData();
+        PageData pd = this.getPageData();
-        pd.put("MAndTUserId",Jurisdiction.getUSER_ID());
+        pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
-        Map result = HttpClientService.doPost(xgfUrl + "/openApi/trainingbatch/list" +getPageUrl(page), pd);
+        String KEYWORDS = pd.getString("KEYWORDS");                        //关键词检索条件
-        return result;
+        if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
+        page.setPd(pd);
+        List<PageData> varList = trainingbatchService.list(page);    //列出TrainingBatch列表
+        map.put("varList", varList);
+        map.put("page", page);
+        map.put("result", "success");
+        return map;
     }
 
     @RequestMapping(value = "/batchUserList")
     @ResponseBody
     public Object batchUserList(Page page) throws Exception {
-        PageData pd = new PageData();
+        PageData request = this.getPageData();
-        pd = this.getPageData();
+        PageData condition = new PageData();
-        Map result = HttpClientService.doPost(xgfUrl + "/openApi/trainingbatch/batchUserList" +getPageUrl(page), pd);
+        condition.put("TRAINING_BATCH_ID", request.get("TRAINING_BATCH_ID"));
-        return result;
+        page.setPd(condition);
+        List<PageData> varList = trainingbatchService.batchUserlistPage(page);
+
+        PageData response = new PageData();
+        response.put("varList", varList);
+        response.put("page", page);
+        response.put("total", page.getTotalResult());
+        response.put("result", "success");
+        return response;
     }
 
     @RequestMapping(value = "/batchAudit")
@@ -59,6 +82,7 @@ public class FlowTrainController extends BaseController {
 
     /**
      * 分公司端-相关方流动人员培训审核-查看用户信息
+     *
      * @return
      * @throws Exception
      */
@@ -76,21 +100,68 @@ public class FlowTrainController extends BaseController {
     @RequestMapping(value = "/approveUser")
     @ResponseBody
     public Object approveUser() throws Exception {
-        PageData pd = new PageData();
+        Map<String,Object> map = new HashMap<String,Object>();
-        pd = this.getPageData();
+        PageData pd = this.getPageData();
-        pd.put("loginUserId",Jurisdiction.getUSER_ID());
+        trainUsersService.approveUser(pd);
-        Map result = HttpClientService.doPost(xgfUrl + "/openApi/trainusers/approveUser", pd);
+        map.put("result", "success");
-        return result;
+        return map;
     }
+
     @RequestMapping(value = "/getDetailsById")
     @ResponseBody
     public Object getDetailsById() throws Exception {
-        PageData pd = new PageData();
+        PageData request = this.getPageData();
-        pd = this.getPageData();
+        PageData condition = new PageData();
-        if(!Jurisdiction.getUsername().equals("admin")){
+        condition.put("TRAINING_BATCH_ID", request.get("TRAINING_BATCH_ID"));
-            pd.put("AUDIT_USER_ID", Jurisdiction.getUSER_ID());
+        PageData entity = trainingbatchService.findById(condition);
+        switch (entity.getString("STEP_STATUS")) {
+            case "0":
+                if (entity.getString("TERRITORIALITY_USER_ID").equals(Jurisdiction.getUSER_ID())) {
+                    entity.put("step", "TERRITORIALITY_STATE");
                 }
-        Map result = HttpClientService.doPost(xgfUrl+ "/openApi/trainingbatch/getDetailsById", pd);
+                break;
-        return result;
+            case "1":
+                if (entity.getString("MANAGER_USER_ID").equals(Jurisdiction.getUSER_ID())) {
+                    entity.put("step", "MANAGER_STATE");
+                }
+                break;
+            case "2":
+                if (entity.getString("SUPERVISION_USER_ID").equals(Jurisdiction.getUSER_ID())) {
+                    entity.put("step", "SUPERVISION_STATE");
+                }
+                break;
+            default:
+                break;
+        }
+        PageData response = new PageData();
+        response.put("pd", entity);
+        response.put("result", "success");
+        return response;
+    }
+
+    @RequestMapping(value = "/endApproval")
+    @ResponseBody
+    public Object endApproval() throws Exception {
+        Map<String,Object> map = new HashMap<String,Object>();
+        PageData pd = this.getPageData();
+        trainUsersService.endApproval(pd);
+        map.put("result", "success");
+        return map;
+    }
+
+    @RequestMapping(value = "/oldBatchList")
+    @ResponseBody
+    public Object oldBatchList(Page page) throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        PageData pd = this.getPageData();
+        pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
+        String KEYWORDS = pd.getString("KEYWORDS");                        //关键词检索条件
+        if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
+        page.setPd(pd);
+        List<PageData> varList = trainingbatchService.oldBatchList(page);    //列出TrainingBatch列表
+        map.put("varList", varList);
+        map.put("page", page);
+        map.put("result", "success");
+        return map;
     }
 }

src/main/java/com/zcloud/mapper/datasource/highriskwork/HighWorkMapper.java

@@ -100,5 +100,17 @@ public interface HighWorkMapper{
 	List<PageData> listAllHighRiskWorkLocation(PageData pd);
 
     void editacceptancapplication(PageData pd);
+
+	List<PageData> listHighRiskWorkFirst(Page page);
+
+	PageData statisticsHighRiskWorkByStateFirst(PageData pd);
+
+	/**
+	 * 统计高危作业里各作业数（一公司）
+	 * @param pd
+	 * @return
+	 * @throws Exception
+	 */
+	List<PageData> statisticsAllHighRiskWorkFirst(PageData pd);
 }
 

src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java

@@ -177,5 +177,9 @@ public interface DepartmentMapper{
     PageData getInfo(PageData pd) throws Exception;
 
     List<PageData> listTreeManageAndCorpHasOrder(PageData pd);
+
+	List<Department> listSubCorpDepartmentByParentId(String parentId);
+
+	PageData findByCorpDepartmentId(PageData condition);
 }
 

src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java

@@ -305,4 +305,5 @@ public interface UsersMapper {
 	PageData getPersonByCardNo(PageData pd);
 
 	PageData findByCardNo(PageData pd);
+	List<PageData> getUsersInfo(PageData pd);
 }

src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java

@@ -75,5 +75,20 @@ public interface OutSourcedMapper{
 	PageData jieshuOutSourced(PageData pd);
 
 	void updateState(PageData pd);
+
+	/** 重点工程隐患 列表
+	 * @param page
+	 * @throws Exception
+	 */
+	List<PageData> hiddenOutsourcedlistPage(Page page);
+
+	/**
+	 * 重点工程管理列表
+	 * @param page
+	 * @return
+	 */
+	List<PageData> outSouceslistPage(Page page);
+
+
 }
 

src/main/java/com/zcloud/mapper/dsno2/keyProjects/VideoManagerMapper.java

@@ -75,5 +75,7 @@ public interface VideoManagerMapper {
 	void editByResourcesId(PageData pd);
 
 	void updateAiByOUTSOURCED_ID(PageData pd);
+
+	List<PageData> dataApplistPage(Page page);
 }
 

src/main/java/com/zcloud/service/highriskwork/HighWorkService.java

@@ -103,5 +103,29 @@ public interface HighWorkService{
 	 * @throws Exception
 	 */
 	List<PageData> listAllHighRiskWorkLocation(PageData pd)throws Exception;
+
+	/**
+	 * 作业实时情况展示（一公司）
+	 * @param page
+	 * @return
+	 * @throws Exception
+	 */
+	List<PageData> listHighRiskWorkFirst(Page page)throws Exception;
+
+	/**
+	 * 获取高危作业统计数据（申请数[COUNTAPPLY]，审批中[COUNTAPPROVE]，归档[COUNTARCHIVE]）（一公司）
+	 * @param pd
+	 * @return
+	 * @throws Exception
+	 */
+	PageData statisticsHighRiskWorkByStateFirst(PageData pd)throws Exception;
+
+	/**
+	 * 统计高危作业里各作业数（一公司）
+	 * @param pd
+	 * @return
+	 * @throws Exception
+	 */
+	List<PageData> statisticsAllHighRiskWorkFirst(PageData pd)throws Exception;
 }
 

src/main/java/com/zcloud/service/highriskwork/impl/HighWorkServiceImpl.java

@@ -176,5 +176,26 @@ public class HighWorkServiceImpl implements HighWorkService {
 	public List<PageData> listAllHighRiskWorkLocation(PageData pd) throws Exception {
 		return highworkMapper.listAllHighRiskWorkLocation(pd);
 	}
+
+	@Override
+	public List<PageData> listHighRiskWorkFirst(Page page) throws Exception {
+		return highworkMapper.listHighRiskWorkFirst(page);
+	}
+
+	@Override
+	public PageData statisticsHighRiskWorkByStateFirst(PageData pd) throws Exception {
+		return highworkMapper.statisticsHighRiskWorkByStateFirst(pd);
+	}
+
+	/**
+	 * 统计高危作业里各作业数（一公司）
+	 * @param pd
+	 * @return
+	 * @throws Exception
+	 */
+	@Override
+	public List<PageData> statisticsAllHighRiskWorkFirst(PageData pd) throws Exception {
+		return highworkMapper.statisticsAllHighRiskWorkFirst(pd);
+	}
 }
 

src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java

@@ -76,5 +76,21 @@ public interface OutSourcedService{
 	PageData jieshuOutSourced(PageData pd);
 
 	void updateState(PageData pd);
+
+	/** 查询隐患的重点工程列表  排序规则不一致
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> listHiddenOutsourced(Page page)throws Exception;
+
+	/**
+	 * 重点工程管理列表APP
+	 * @param page
+	 * @return
+	 * @throws Exception
+	 */
+	public List<PageData> outSouceslistPage(Page page)throws Exception;
+
+
 }
 

src/main/java/com/zcloud/service/keyProjects/VideoManagerService.java

@@ -73,5 +73,7 @@ public interface VideoManagerService {
 
 
 	void updateAiByOUTSOURCED_ID(PageData pd);
+
+	List<PageData> listApp(Page page);
 }
 

src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java

@@ -106,5 +106,15 @@ public class OutSourcedServiceImpl implements OutSourcedService {
 		pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
 		outsourcedMapper.updateState(pd);
 	}
+
+	@Override
+	public List<PageData> listHiddenOutsourced(Page page) throws Exception {
+		return outsourcedMapper.hiddenOutsourcedlistPage(page);
+	}
+
+	@Override
+	public List<PageData> outSouceslistPage(Page page) throws Exception {
+		return outsourcedMapper.outSouceslistPage(page);
+	}
 }
 

src/main/java/com/zcloud/service/keyProjects/impl/VideoManagerServiceImpl.java

@@ -121,5 +121,10 @@ public class VideoManagerServiceImpl implements VideoManagerService {
 	public void updateAiByOUTSOURCED_ID(PageData pd) {
 		videomanagerMapper.updateAiByOUTSOURCED_ID(pd);
 	}
+
+	@Override
+	public List<PageData> listApp(Page page) {
+		return videomanagerMapper.dataApplistPage(page);
+	}
 }
 

src/main/java/com/zcloud/service/system/DepartmentService.java

@@ -227,5 +227,9 @@ public interface DepartmentService{
     PageData getDepartmentInfo(PageData pd) throws Exception;
 
     List<PageData> listTreeManageAndCorpHasOrder(PageData pd);
+
+	List<Department> listAllCorpDepartment(String number) throws Exception;
+
+	PageData getCorpDepartment(PageData condition) throws Exception;
 }
 

src/main/java/com/zcloud/service/system/UsersService.java

@@ -364,4 +364,6 @@ public interface UsersService {
 	Object getPersonPositioningStatistics(PageData pd) throws Exception;
 
 	Object getCurrentLocationCount(PageData pd);
+
+	List<PageData> getRegUserInfo(PageData pd);
 }

src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
 
 import com.zcloud.entity.system.Menu;
 import com.zcloud.mapper.datasource.system.SupervisionDepartmentMapper;
+import com.zcloud.mapper.dsno2.system.Department2Mapper;
 import com.zcloud.util.DateUtil;
 import com.zcloud.util.Jurisdiction;
 import com.zcloud.util.UuidUtil;
@@ -33,6 +34,9 @@ public class DepartmentServiceImpl implements DepartmentService{
 
 	@Resource
 	private DepartmentMapper departmentMapper;
+
+	@Resource
+	private Department2Mapper department2Mapper;
 	/**新增
 	 * @param pd
 	 * @throws Exception
@@ -419,5 +423,36 @@ public class DepartmentServiceImpl implements DepartmentService{
 	public List<PageData> listTreeManageAndCorpHasOrder(PageData pd) {
 		return departmentMapper.listTreeManageAndCorpHasOrder(pd);
 	}
+
+	@Override
+	public List<Department> listAllCorpDepartment(String parentId) throws Exception{
+		List<Department> departmentList = this.listSubCorpDepartmentByParentId(parentId);
+		for(Department depar : departmentList){
+			depar.setTreeurl("department_list.html?DEPARTMENT_ID="+depar.getDEPARTMENT_ID());
+			depar.setSubDepartment(this.listAllCorpDepartment(depar.getDEPARTMENT_ID()));
+			depar.setTarget("treeFrame");
+			depar.setIcon("../../../assets/images/user.gif");
+		}
+		return departmentList;
+	}
+
+	@Override
+	public PageData getCorpDepartment(PageData condition) throws Exception {
+		return departmentMapper.findByCorpDepartmentId(condition);
+	}
+
+	/**
+	 * 通过ID获取其子级列表
+	 * @param parentId
+	 * @return
+	 * @throws Exception
+	 */
+	public List<Department> listSubCorpDepartmentByParentId(String parentId) throws Exception {
+		return departmentMapper.listSubCorpDepartmentByParentId(parentId);
+	}
+
+
+
+
 }
 

src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java

@@ -484,6 +484,11 @@ public class UsersServiceImpl implements UsersService {
 		return usersMapper.getUserInfo(pd);
 	}
 
+	@Override
+	public List<PageData> getRegUserInfo(PageData pd) {
+		return usersMapper.getUsersInfo(pd);
+	}
+
 	@Override
 	public PageData getPersonByCardNo(PageData pd) {
 		return usersMapper.getPersonByCardNo(pd);

src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java

@@ -18,6 +18,7 @@ import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.ss.usermodel.VerticalAlignment;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.shiro.session.Session;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.servlet.view.document.AbstractXlsView;
 
 import com.zcloud.entity.PageData;
@@ -31,6 +32,9 @@ import net.coobird.thumbnailator.Thumbnails;
  */
 public class HiddenExcelImgToSessionView extends AbstractXlsView{
 
+	@Value("${http.file.url}")
+	private String fileUrl;
+
 	@Override
 	protected void buildExcelDocument(Map<String, Object> model,
 									  Workbook workbook, HttpServletRequest request,
@@ -38,7 +42,7 @@ public class HiddenExcelImgToSessionView extends AbstractXlsView{
 		// TODO Auto-generated method stub
 		String proPath = PathUtil.getProjectpath();
 		Session session = Jurisdiction.getSession();
-		String beji = Const.HTTPFILEURL;
+		String beji = fileUrl;
 		//beji =beji.replaceAll("\\\\", "/");
 //		String beji = "https://qgqy.qhdsafety.com/file/";
 		Date date = new Date();

src/main/java/com/zcloud/util/HiddenExcelImgView.java

@@ -26,6 +26,7 @@ import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.ss.usermodel.VerticalAlignment;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.servlet.view.document.AbstractXlsView;
 
 import com.zcloud.entity.PageData;
@@ -37,13 +38,16 @@ import com.zcloud.entity.PageData;
  */
 public class HiddenExcelImgView extends AbstractXlsView{
 
+	@Value("${http.file.url}")
+	private String fileUrl;
+
 	@Override
 	protected void buildExcelDocument(Map<String, Object> model,
 									  Workbook workbook, HttpServletRequest request,
 									  HttpServletResponse response) throws Exception {
 		// TODO Auto-generated method stub
 		String proPath = PathUtil.getProjectpath();
-		String beji = Const.HTTPFILEURL;
+		String beji = fileUrl;
 		//beji =beji.replaceAll("\\\\", "/");
 
 		Date date = new Date();

src/main/java/com/zcloud/util/HttpClientService.java

@@ -365,46 +365,9 @@ public class HttpClientService {
     }
 
     public static Map doPost(String url, PageData pd) {
-        /* 正式上面总是显示一次断一次，未找到原因
-        MultiValueMap<String, String> requestBody = new LinkedMultiValueMap();
-        pd.forEach((key, value) -> {
-            requestBody.add(key.toString(), value.toString());
-        });
-        System.out.println(requestBody);
-        Map<String,Object> responseBody = new HashMap<String,Object>();
-        TcpClient tcpClient = TcpClient.create()
-                .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 1000) // Connection Timeout
-                .doOnConnected(connection ->
-                        connection.addHandlerLast(new ReadTimeoutHandler(10)) // Read Timeout
-                                .addHandlerLast(new WriteTimeoutHandler(10))); // Write Timeout
-        WebClient client = WebClient.builder().clientConnector(new ReactorClientHttpConnector(HttpClient.from(tcpClient))).build();
-        client.post()
-                .uri(url)
-                .header("Source","zcloud")
-                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-                .body(BodyInserters.fromFormData(requestBody))
-                .exchange()
-                .flatMap(response -> {
-                    System.out.println("Status code: " + response.statusCode().value());
-                    return response.bodyToMono(JSONObject.class);
-                })
-                .doOnSuccess(body -> {
-                    System.out.println("success");
-                    responseBody.putAll(body);
-                })
-                .doOnError(throwable -> {
-                    responseBody.put("msg",throwable.getMessage());
-                    System.out.println("Error occurred: " + throwable.getMessage());
-                })
-                .block();
-        return responseBody;
-        */
         JSONObject jsonObject = null;
         HttpResponse response = null;
         List<NameValuePair> nameValuePairList = new ArrayList<NameValuePair>();
-//        pd.forEach((key, value) -> {    // 这个遍历不好使
-//            System.out.println("键：" + key.toString() + "，值：" + value.toString());
-//        });
         Map<Object, Object> map = (Map)pd;
         System.out.print("参数：{");
         for(Map.Entry<Object, Object> entry : map.entrySet()){

src/main/resources/application-dev.properties

@@ -20,6 +20,8 @@ spring.datasource.maxWait: 60000
 #??PSCache?????????PSCache???
 spring.datasource.poolPreparedStatements: true
 spring.datasource.maxPoolPreparedStatementPerConnectionSize: 20
+#??connectionProperties?????mergeSql????SQL??
+#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
 spring.datasource.minIdle: 1
 spring.datasource.timeBetweenEvictionRunsMillis: 60000
 spring.datasource.minEvictableIdleTimeMillis: 300000
@@ -27,36 +29,47 @@ spring.datasource.validationQuery: select 1 from dual
 spring.datasource.testWhileIdle: true
 spring.datasource.testOnBorrow: false
 spring.datasource.testOnReturn: false
+#?????????filters????????sql?????,'wall'?????
 filters: stat, wall, log4j
 
+#????????
 spring.cache.ehcache.cofnig=ehcache.xml
+
+#?????,?????sql??
 logging.level.com.zcloud.mapper=debug
+
+#????????
 spring.servlet.multipart.max-file-size=500MB
 spring.servlet.multipart.max-request-size=500MB
+
+#activiti????
 spring.activiti.check-process-definitions=false
 
+#??
 spring.http.encoding.charset=UTF-8
 spring.http.encoding.force=true
 spring.http.encoding.enabled=true
+# ??springboot????banner
 spring.main.banner-mode=off
 
 preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/
 qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/
 
+#preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/
+#qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/
+#?????
+smb.host=39.103.224.166
+smb.port=22
+smb.user=root
+smb.password=Zcloud@zcloud88888
+smb.basePath=/mnt/qgfile/file/
 
-
+#Mq\u914D\u7F6E
-
+rocketmq.consumer.group2=edu-admin-edit
-#????????
+rocketmq.consumer.group1=edu-admin-add
-czks-useridentity=CZKS
+#rocketmq.name-server=10.0.140.141:9876
-czks-baseimgpath=https://qgqy.qhdsafety.com/file/
+#rocketmq.name-server=192.168.0.70:9876
-czks-backendaddr=http://192.168.0.31:7811/qa-prevention-gwj/
+rocketmq.name-server=192.168.0.31:9876
-#???????
-gwj-useridentity=GWJ
-gwj-baseimgpath=https://qgqy.qhdsafety.com/file/
-gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/
-
-#mq ???????????
-rocketmq.name-server=192.168.0.79:9876
 rocketmq.producer.group=libmiddle
 rocketmq.producer.send-message-timeout=3000
 rocketmq.producer.compress-message-body-threshold=4096
@@ -64,7 +77,8 @@ rocketmq.producer.max-message-size=4194304
 rocketmq.producer.retry-times-when-send-failed=3
 rocketmq.producer.retry-next-server=true
 rocketmq.producer.retry-times-when-send-async-failed=3
-## ????
+## topic \u524D\u7F00
+
 mq.topic.info=info
 mq.topic.eightWork=eightWork
 mq.group.info=scheduled_tasks
@@ -75,16 +89,12 @@ mq.topic.docking=docking
 mq.topic.dockingPicture=dockingPicture
 mq.group.docking=scheduled_tasks_docking
 
-#??????
 perLoc.url=http://192.168.210.32:8084
 perLoc.userName=qaaqadmin
 perLoc.pwd=Cfd2023@
+corp.default.pic-path=https://qgqy.qhdsafety.com/
+corp.default.back-end-path=https://qgqy.qhdsafety.com/file/
 
-#???????
+http.file.url=https://qgqy.qhdsafety.com/file/
-smb.host=39.101.130.96
-smb.port=22
-smb.user=root
-smb.password=Zcloud@zcloud88888
-smb.basePath=/mnt/wwag/file/
 #????????????
 baseimgpath =https://wwag.qhdsafety.com/file/

src/main/resources/mybatis/datasource/highriskwork/HighWorkMapper.xml

@@ -877,4 +877,519 @@
 		) f
 	</select>
 
+	<select id="listHighRiskWorkFirst" resultType="com.zcloud.entity.PageData">
+		SELECT * FROM
+		(SELECT
+		f.HOTWORK_ID ID,
+		f.CHECK_NO WORK_NUMBER,
+		'动火作业' WORK_TYPE,
+		CASE
+		f.APPLY_STATUS
+		WHEN 0 THEN '动火作业待提交'
+		WHEN 1 THEN '作业负责人待审核'
+		WHEN 2 THEN '所在单位待审核'
+		WHEN 4 THEN '安全管理部门待审核'
+		WHEN 5 THEN '动火审批人待审核'
+		WHEN 6 THEN '班长待验票'
+		WHEN 7 THEN '待验收'
+		END STATUS_NAME,
+		CASE WHEN f.APPLY_STATUS = 0 THEN
+		IFNULL(
+		GROUP_CONCAT(
+		REPLACE ( u1.NAME, '/', ',' )),
+		IFNULL( qu1.`NAME`, '' ))
+		WHEN f.APPLY_STATUS = 1 THEN
+		IFNULL(
+		GROUP_CONCAT(
+		REPLACE ( u1.NAME, '/', ',' )),
+		IFNULL( qu1.`NAME`, '' ))
+		WHEN f.APPLY_STATUS = 2 THEN
+		IFNULL(
+		GROUP_CONCAT(
+		REPLACE ( u2.NAME, '/', ',' )),
+		IFNULL( qu2.`NAME`, '' ))
+
+		WHEN f.APPLY_STATUS = 4 THEN
+		IFNULL(
+		GROUP_CONCAT(
+		REPLACE ( u3.NAME, '/', ',' )),
+		IFNULL( qu3.`NAME`, '' ))
+
+		WHEN f.APPLY_STATUS = 5 THEN
+		IFNULL(
+		GROUP_CONCAT(
+		REPLACE ( u4.NAME, '/', ',' )),
+		IFNULL( qu4.`NAME`, '' ))
+		WHEN f.APPLY_STATUS = 6 THEN
+		IFNULL(
+		GROUP_CONCAT(
+		REPLACE ( u5.NAME, '/', ',' )),
+		IFNULL( qu5.`NAME`, '' ))
+		WHEN f.APPLY_STATUS = 7 THEN
+		IFNULL(
+		GROUP_CONCAT(
+		REPLACE ( u6.NAME, '/', ',' )),
+		IFNULL( qu6.`NAME`, '' ))
+		ELSE
+		IFNULL(
+		GROUP_CONCAT(
+		REPLACE ( u6.NAME, '/', ',' )),
+		IFNULL( qu6.`NAME`, '' ))
+		END USER_NAME,
+		DATE_FORMAT( ifnull( f.OPERATTIME, f.CREATTIME ), '%Y-%m-%d %H:%i:%s' ) OPERATTIME
+		FROM
+		bus_hotwork_cfd f
+		LEFT JOIN sys_user u1 ON u1.USER_ID = f.CONFIRM_USER_ID
+		LEFT JOIN `qa-gwj-regulatory`.sys_user qu1 ON qu1.USER_ID = f.CONFIRM_USER_ID
+		LEFT JOIN sys_user u2 ON u2.USER_ID = f.LEADER_USER_ID
+		LEFT JOIN `qa-gwj-regulatory`.sys_user qu2 ON qu2.USER_ID = f.LEADER_USER_ID
+		LEFT JOIN sys_user u3 ON u3.USER_ID = f.AUDIT_USER_ID
+		LEFT JOIN `qa-gwj-regulatory`.sys_user qu3 ON qu3.USER_ID = f.AUDIT_USER_ID
+		LEFT JOIN sys_user u4 ON u4.USER_ID = f.APPROVE_USER_ID
+		LEFT JOIN `qa-gwj-regulatory`.sys_user qu4 ON qu4.USER_ID = f.APPROVE_USER_ID
+		LEFT JOIN sys_user u5 ON u5.USER_ID = f.MONITOR_USER_ID
+		LEFT JOIN `qa-gwj-regulatory`.sys_user qu5 ON qu5.USER_ID = f.MONITOR_USER_ID
+		LEFT JOIN sys_user u6 ON u6.USER_ID = f.ACCEPT_USER_ID
+		LEFT JOIN `qa-gwj-regulatory`.sys_user qu6 ON qu6.USER_ID = f.ACCEPT_USER_ID
+		WHERE
+		f.ISDELETE = '0'
+		AND f.APPLY_STATUS >= 0
+		AND f.APPLY_STATUS != 8
+		<if test="pd.CORPINFO_ID!= null and pd.CORPINFO_ID!=''">
+			and f.CORPINFO_ID = #{pd.CORPINFO_ID}
+		</if>
+		<if test="pd.ids!= null and pd.ids.size()>0">
+			AND  f.CORPINFO_ID IN
+			<foreach item="item" index="index" collection="pd.ids" open="(" separator="," close=")">
+				#{pd.ids[${index}]}
+			</foreach>
+		</if>
+		GROUP BY f.HOTWORK_ID
+		UNION ALL
+		SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME
+		FROM
+		(SELECT
+		f.electricity_ID ID,
+		f.CHECK_NO WORK_NUMBER,
+		'临时用电作业' WORK_TYPE,
+		case f.APPLY_STATUS
+		when '0' then '待提交'
+		when '1' then '待确认'
+		when '2' then '待审批'
+		when '3' then '已归档'
+		when '4' then '已验收'
+		when '-1' then '已打回'
+		END STATUS_NAME,
+		case f.APPLY_STATUS
+		when '0' then f.APPLY_USER_ID
+		when '1' then f.ASSURE_USER_ID
+		when '2' then f.APPROVE_USER_ID
+		when '3' then f.ACCEPT_USER_ID
+		when '-1' then f.APPLY_USER_ID
+		END NEXT_USER_ID,
+		ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME
+		FROM bus_electricity f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS NOT IN ('3','4')
+		AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i')
+		<if test="pd.CORPINFO_ID!= null and pd.CORPINFO_ID!=''">
+			and f.CORPINFO_ID = #{pd.CORPINFO_ID}
+		</if>
+		<if test="pd.ids!= null and pd.ids.size()>0">
+			AND  f.CORPINFO_ID IN
+			<foreach item="item" index="index" collection="pd.ids" open="(" separator="," close=")">
+				#{pd.ids[${index}]}
+			</foreach>
+		</if>
+		) f
+		LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID
+		UNION ALL
+		SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME
+		FROM
+		(SELECT
+		f.blindboard_ID ID,
+		f.CHECK_NO WORK_NUMBER,
+		'盲板作业' WORK_TYPE,
+		case f.APPLY_STATUS
+		when '1' then '待确认'
+		when '2' then '待审批'
+		when '3' then '已归档'
+		when '4' then '已打回'
+		END STATUS_NAME,
+		case f.APPLY_STATUS
+		when '1' then bb.OPERATION_UNIT_PERSONCHARGE
+		when '2' then bb.CORPINFO_APPROVER
+		when '3' then f.APPLY_USER_ID
+		when '4' then f.APPLY_USER_ID
+		END NEXT_USER_ID,
+		ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME
+		FROM bus_blindboard f
+		LEFT JOIN bus_blindboardinfo bb ON bb.BLINDBOARD_ID = f.BLINDBOARD_ID
+		WHERE f.ISDELETE = '0' AND f.APPLY_STATUS NOT IN ('3','4')
+		AND date_format(now(),'%Y-%m-%d %H:%i') >= bb.BOARD_INSTALL_TIME AND bb.BOARD_DISASSEMBLE_TIME >= date_format(now(),'%Y-%m-%d %H:%i')
+		<if test="pd.CORPINFO_ID!= null and pd.CORPINFO_ID!=''">
+			and f.CORPINFO_ID = #{pd.CORPINFO_ID}
+		</if>
+		<if test="pd.ids!= null and pd.ids.size()>0">
+			AND  f.CORPINFO_ID IN
+			<foreach item="item" index="index" collection="pd.ids" open="(" separator="," close=")">
+				#{pd.ids[${index}]}
+			</foreach>
+		</if>
+		) f
+		LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID
+		UNION ALL
+		SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME
+		FROM
+		(SELECT
+		f.HIGHWORK_ID ID,
+		f.CHECK_NO WORK_NUMBER,
+		'高处作业' WORK_TYPE,
+		case f.APPLY_STATUS
+		when '0' then '待提交'
+		when '1' then '待确认'
+		when '2' then '待审核'
+		when '3' then '待审批'
+		when '4' then '已归档'
+		when '5' then '已验收'
+		when '-2' then '确认打回'
+		when '-3' then '审核打回'
+		when '-4' then '审批打回'
+		when '55' then '待验收'
+		END STATUS_NAME,
+		case f.APPLY_STATUS
+		when '1' then f.CONSTRUCTION_USER_ID
+		when '2' then f.AUDIT_USER_ID
+		when '3' then f.APPROVE_USER_ID
+		when '-2' then f.CREATOR
+		when '-3' then f.CREATOR
+		when '-4' then f.CREATOR
+		when '55' then f.ACCEPT_USER_ID
+		END NEXT_USER_ID,
+		ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME
+		FROM bus_highwork f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS NOT IN ('4','5','55','-5')
+		AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i')
+		<if test="pd.CORPINFO_ID!= null and pd.CORPINFO_ID!=''">
+			and f.CORPINFO_ID = #{pd.CORPINFO_ID}
+		</if>
+		<if test="pd.ids!= null and pd.ids.size()>0">
+			AND  f.CORPINFO_ID IN
+			<foreach item="item" index="index" collection="pd.ids" open="(" separator="," close=")">
+				#{pd.ids[${index}]}
+			</foreach>
+		</if>
+		) f
+		LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID
+		UNION ALL
+		SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME
+		FROM
+		(SELECT
+		f.confinedspace_ID ID,
+		f.WORK_PERMIT_NUMBER WORK_NUMBER,
+		'有限空间作业' WORK_TYPE,
+		case f.APPLY_STATUS
+		when '1' then '待采样'
+		when '2' then '作业单位责任人确认'
+		when '3' then '作业现场责任人审核'
+		when '4' then '管理单位责任人审批'
+		when '5' then '作业单位责任人验收'
+		when '6' then '管理单位责任人验收'
+		when '-2' then '作业单位责任人确认打回'
+		when '-3' then '作业现场责任人审核打回'
+		when '-4' then '管理单位责任人审批打回'
+		when '-5' then '作业单位责任人验收打回'
+		when '-6' then '管理单位责任人验收打回'
+		END STATUS_NAME,
+		case f.APPLY_STATUS
+		when '1' then f.SAMPLING_ANALYST_ID
+		when '2' then f.WORK_UNIT_MANAGER_ID
+		when '3' then f.JOB_SITE_MANAGER_ID
+		when '4' then f.MANAGEMENT_UNIT_ID
+		when '5' then f.WORK_UNIT_MANAGER_ID
+		when '6' then f.MANAGEMENT_UNIT_ID
+		when '-2' then f.CREATOR
+		when '-3' then f.CREATOR
+		when '-4' then f.CREATOR
+		when '-5' then f.CREATOR
+		when '-6' then f.CREATOR
+		END NEXT_USER_ID,
+		ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME
+		FROM bus_confinedspace f WHERE f.ISDELETE = '0' AND f.APPLY_STATUS != '7'
+		AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i')
+		<if test="pd.CORPINFO_ID!= null and pd.CORPINFO_ID!=''">
+			and f.CORPINFO_ID = #{pd.CORPINFO_ID}
+		</if>
+		<if test="pd.ids!= null and pd.ids.size()>0">
+			AND  f.CORPINFO_ID IN
+			<foreach item="item" index="index" collection="pd.ids" open="(" separator="," close=")">
+				#{pd.ids[${index}]}
+			</foreach>
+		</if>
+		) f
+		LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID
+		UNION ALL
+		SELECT f.ID, f.WORK_NUMBER, f.WORK_TYPE, f.STATUS_NAME, u.NAME USER_NAME, f.OPERATTIME
+		FROM
+		(SELECT
+		f.hoisting_ID ID,
+		f.NUMBERING WORK_NUMBER,
+		'吊装作业' WORK_TYPE,
+		case f.APPLY_STATUS
+		when '0' then '待提交'
+		when '1' then '待确认'
+		when '2' then '待审核'
+		when '3' then '待审批'
+		when '4' then '已归档'
+		when '5' then '已验收'
+		when '-2' then '确认打回'
+		when '-3' then '审核打回'
+		when '-4' then '审批打回'
+		when '55' then '待验收'
+		END STATUS_NAME,
+		case f.APPLY_STATUS
+		when '1' then f.CONSTRUCTION_JOB_MANAGER_ID
+		when '2' then f.WORK_UNIT_MANAGER_ID
+		when '3' then f.BRANCH_APPROVER_ID
+		when '-2' then f.CREATOR
+		when '-3' then f.CREATOR
+		when '-4' then f.CREATOR
+		when '55' then f.ACCEPTOR_ID
+		END NEXT_USER_ID,
+		ifnull(f.OPERATTIME,f.CREATTIME) OPERATTIME
+		FROM bus_hoisting f
+		WHERE f.ISDELETE = '0'  AND f.APPLY_STATUS NOT IN ('4','5','55','-5')
+		AND date_format(now(),'%Y-%m-%d %H:%i') >= f.JOB_START_TIME AND f.JOB_END_TIME >= date_format(now(),'%Y-%m-%d %H:%i')
+		<if test="pd.CORPINFO_ID!= null and pd.CORPINFO_ID!=''">
+			and f.CORPINFO_ID = #{pd.CORPINFO_ID}
+		</if>
+		<if test="pd.ids!= null and pd.ids.size()>0">
+			AND  f.CORPINFO_ID IN
+			<foreach item="item" index="index" collection="pd.ids" open="(" separator="," close=")">
+				#{pd.ids[${index}]}
+			</foreach>
+		</if>
+		) f
+		LEFT JOIN sys_user u ON u.USER_ID = f.NEXT_USER_ID
+		) f
+		ORDER BY f.OPERATTIME DESC
+	</select>
+
+	<select id="statisticsHighRiskWorkByStateFirst" resultType="com.zcloud.entity.PageData">
+		SELECT
+		SUM(f.COUNTAPPLY) COUNTAPPLY,SUM(f.COUNTAPPROVE) COUNTAPPROVE,SUM(f.COUNTARCHIVE) COUNTARCHIVE
+		FROM (
+		SELECT
+		COUNT( CASE WHEN f.APPLY_STATUS > 0 THEN f.HOTWORK_ID END ) COUNTAPPLY,
+		COUNT( CASE WHEN f.APPLY_STATUS > 0 AND f.APPLY_STATUS != 8 THEN f.HOTWORK_ID END ) COUNTAPPROVE,
+		COUNT( CASE WHEN f.APPLY_STATUS = 8 THEN f.HOTWORK_ID END ) COUNTARCHIVE
+		FROM bus_hotwork_cfd f WHERE f.ISDELETE = '0'
+		<if test="CORPINFO_ID!= null and CORPINFO_ID!=''">
+			and f.CORPINFO_ID = #{CORPINFO_ID}
+		</if>
+		<if test="ids!= null and ids.size()>0">
+			AND  f.CORPINFO_ID IN
+			<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+		UNION ALL
+		SELECT
+		(
+		SELECT
+		count( 1 )
+		FROM
+		bus_electricity f
+		WHERE
+		<if test="CORPINFO_ID!= null and CORPINFO_ID!=''">
+			f.CORPINFO_ID = #{CORPINFO_ID}
+		</if>
+		<if test="ids!= null and ids.size()>0">
+			f.CORPINFO_ID IN
+			<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+		AND (
+		f.APPLY_STATUS != '0'  AND f.APPLY_STATUS NOT IN ('3','4')
+		AND date_format( now(), '%Y-%m-%d %H:%i' ) >= f.WORK_START_DATE
+		AND f.WORK_END_DATE >= date_format( now(), '%Y-%m-%d %H:%i' )
+		OR f.APPLY_STATUS IN ( '3', '4' )
+		)
+		) COUNTAPPLY,
+		COUNT(case when f.APPLY_STATUS != '0' AND f.APPLY_STATUS NOT IN ('3','4') AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') then f.ELECTRICITY_ID end) COUNTAPPROVE,
+		COUNT(case when f.APPLY_STATUS IN ('3','4') then f.ELECTRICITY_ID end) COUNTARCHIVE
+		FROM bus_electricity f WHERE f.ISDELETE = '0'
+		<if test="CORPINFO_ID!= null and CORPINFO_ID!=''">
+			and f.CORPINFO_ID = #{CORPINFO_ID}
+		</if>
+		<if test="ids!= null and ids.size()>0">
+			AND  f.CORPINFO_ID IN
+			<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+		UNION ALL
+		SELECT
+		(
+		SELECT
+		count( 1 )
+		FROM
+		bus_blindboard f
+		LEFT JOIN
+		bus_blindboardinfo bb ON bb.BLINDBOARD_ID = f.BLINDBOARD_ID
+		WHERE
+		<if test="CORPINFO_ID!= null and CORPINFO_ID!=''">
+			f.CORPINFO_ID = #{CORPINFO_ID}
+		</if>
+		<if test="ids!= null and ids.size()>0">
+			f.CORPINFO_ID IN
+			<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+		AND (
+		f.APPLY_STATUS != '0' AND f.APPLY_STATUS != '3'
+		AND date_format( now(), '%Y-%m-%d %H:%i' ) >= bb.BOARD_INSTALL_TIME
+		AND bb.BOARD_DISASSEMBLE_TIME >= date_format( now(), '%Y-%m-%d %H:%i' )
+		OR f.APPLY_STATUS = '3'
+		)
+		)  COUNTAPPLY,
+		COUNT(case when f.APPLY_STATUS != '0' AND f.APPLY_STATUS != '3' AND date_format(now(),'%Y-%m-%d %H:%i') >= bb.BOARD_INSTALL_TIME AND bb.BOARD_DISASSEMBLE_TIME >= date_format(now(),'%Y-%m-%d %H:%i') then f.BLINDBOARD_ID end) COUNTAPPROVE,
+		COUNT(case when f.APPLY_STATUS = '3' then f.BLINDBOARD_ID end) COUNTARCHIVE
+		FROM bus_blindboard f
+		LEFT JOIN bus_blindboardinfo bb ON bb.BLINDBOARD_ID = f.BLINDBOARD_ID
+		WHERE f.ISDELETE = '0'
+		<if test="CORPINFO_ID!= null and CORPINFO_ID!=''">
+			and f.CORPINFO_ID = #{CORPINFO_ID}
+		</if>
+		<if test="ids!= null and ids.size()>0">
+			AND  f.CORPINFO_ID IN
+			<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+		UNION ALL
+		SELECT
+		(
+		SELECT
+		count( 1 )
+		FROM
+		bus_highwork f
+		WHERE
+		<if test="CORPINFO_ID!= null and CORPINFO_ID!=''">
+			f.CORPINFO_ID = #{CORPINFO_ID}
+		</if>
+		<if test="ids!= null and ids.size()>0">
+			f.CORPINFO_ID IN
+			<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+		AND (
+		f.APPLY_STATUS != '0' AND f.APPLY_STATUS NOT IN ('4','55','5','-5')
+		AND date_format( now(), '%Y-%m-%d %H:%i' ) >= f.WORK_START_DATE
+		AND f.WORK_END_DATE >= date_format( now(), '%Y-%m-%d %H:%i' )
+		OR f.APPLY_STATUS IN ( '4', '55', '5', '-5' )
+		)
+		) COUNTAPPLY,
+		COUNT(case when f.APPLY_STATUS != '0' AND f.APPLY_STATUS NOT IN ('4','55','5','-5') AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') then f.HIGHWORK_ID end) COUNTAPPROVE,
+		COUNT(case when f.APPLY_STATUS in ('4','55','5','-5') then f.HIGHWORK_ID end) COUNTARCHIVE
+		FROM bus_highwork f WHERE f.ISDELETE = '0'
+		<if test="CORPINFO_ID!= null and CORPINFO_ID!=''">
+			and f.CORPINFO_ID = #{CORPINFO_ID}
+		</if>
+		<if test="ids!= null and ids.size()>0">
+			AND  f.CORPINFO_ID IN
+			<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+		UNION ALL
+		SELECT
+		(
+		SELECT
+		count(1)
+		FROM
+		bus_confinedspace f
+		WHERE
+		<if test="CORPINFO_ID!= null and CORPINFO_ID!=''">
+			f.CORPINFO_ID = #{CORPINFO_ID}
+		</if>
+		<if test="ids!= null and ids.size()>0">
+			f.CORPINFO_ID IN
+			<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+		AND (
+		f.APPLY_STATUS != '0'  and f.APPLY_STATUS != '7'
+		AND date_format( now(), '%Y-%m-%d %H:%i' ) >= f.WORK_START_DATE
+		AND f.WORK_END_DATE >= date_format( now(), '%Y-%m-%d %H:%i' )
+		OR f.APPLY_STATUS = '7'
+		)
+		) COUNTAPPLY,
+		COUNT(case when f.APPLY_STATUS != '0' and f.APPLY_STATUS != '7' AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') then f.CONFINEDSPACE_ID end) COUNTAPPROVE,
+		COUNT(case when f.APPLY_STATUS = '7' then f.CONFINEDSPACE_ID end) COUNTARCHIVE
+		FROM bus_confinedspace f WHERE f.ISDELETE = '0'
+		<if test="CORPINFO_ID!= null and CORPINFO_ID!=''">
+			and f.CORPINFO_ID = #{CORPINFO_ID}
+		</if>
+		<if test="ids!= null and ids.size()>0">
+			AND  f.CORPINFO_ID IN
+			<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+		UNION ALL
+		SELECT
+		(
+		SELECT
+		count( 1 )
+		FROM
+		bus_hoisting f
+		WHERE
+		<if test="CORPINFO_ID!= null and CORPINFO_ID!=''">
+			f.CORPINFO_ID = #{CORPINFO_ID}
+		</if>
+		<if test="ids!= null and ids.size()>0">
+			f.CORPINFO_ID IN
+			<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+		AND (
+		f.APPLY_STATUS != '0' and f.APPLY_STATUS not in ('4','55','5','-5')
+		AND date_format( now(), '%Y-%m-%d %H:%i' ) >= f.JOB_START_TIME
+		AND f.JOB_END_TIME >= date_format( now(), '%Y-%m-%d %H:%i' )
+		OR f.APPLY_STATUS IN ( '4', '55', '5', '-5' )
+		)
+		) COUNTAPPLY,
+		COUNT(case when f.APPLY_STATUS != '0' and f.APPLY_STATUS not in ('4','55','5','-5') AND date_format(now(),'%Y-%m-%d %H:%i') >= f.JOB_START_TIME AND f.JOB_END_TIME >= date_format(now(),'%Y-%m-%d %H:%i') then f.HOISTING_ID end) COUNTAPPROVE,
+		COUNT(case when f.APPLY_STATUS IN ('4','55','5','-5') then f.HOISTING_ID end) COUNTARCHIVE
+		FROM bus_hoisting f WHERE f.ISDELETE = '0'
+		<if test="CORPINFO_ID!= null and CORPINFO_ID!=''">
+			and f.CORPINFO_ID = #{CORPINFO_ID}
+		</if>
+		<if test="ids!= null and ids.size()>0">
+			AND  f.CORPINFO_ID IN
+			<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+		) f
+	</select>
+
+
+	<select id="statisticsAllHighRiskWorkFirst" resultType="com.zcloud.entity.PageData">
+		SELECT count(*) COUNT FROM bus_hotwork_cfd f WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
+		UNION ALL
+		SELECT count(*) COUNT FROM bus_electricity f WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
+		UNION ALL
+		SELECT count(*) COUNT FROM bus_blindboard f WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
+		UNION ALL
+		SELECT count(*) COUNT FROM bus_highwork f WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
+		UNION ALL
+		SELECT count(*) COUNT FROM bus_confinedspace f WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
+		UNION ALL
+		SELECT count(*) COUNT FROM bus_hoisting f WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
+	</select>
+
 </mapper>

src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml

@@ -134,21 +134,23 @@
 	<select id="listAll" parameterType="pd" resultType="pd">
 		select
 		<include refid="Field"></include>
-		,dept.NAME as deptName
+		,if(dept.NAME is null,dept1.NAME,dept.NAME) as deptName
 		,u.NAME as userName
 		,su.USERNAME as userName2
 		, u.USERNAME as userPhone
-		,dept.DEPARTMENT_ID DEPARTMENT_ID
+		,if(dept.DEPARTMENT_ID is null,dept1.DEPARTMENT_ID,dept.DEPARTMENT_ID) as DEPARTMENT_ID
 		,su.USER_TYPE USER_TYPE
 		,reuser.NAME as REGULATORY_USER_NAME
-		,redept.NAME  as REGULATORY_DEPT_NAME
+		,if(redept.NAME is null,redept1.NAME,redept.NAME) as REGULATORY_DEPT_NAME
 		from
 		<include refid="tableName"></include> f
 		left join SYS_USER u on u.USER_ID = f.USER_ID
 		left join bus_specialuser su on su.SPECIALUSER_ID = f.USER_ID
 		left join oa_department dept on dept.DEPARTMENT_ID = u.DEPARTMENT_ID
-		left join `qa-czks-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin'
+		left join oa_department dept1 on dept1.DEPARTMENT_ID = f.USER_ID
-		left join `qa-czks-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID
+		left join `qa-gwj-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin'
+		left join `qa-gwj-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID
+		left join `qa-gwj-regulatory`.SYS_DEPARTMENT redept1 on redept1.DEPARTMENT_ID = f.USER_ID
 		where f.ISDELETE = '0'
 		<if test="hotIds != null and hotIds.size>0"> <!-- 关键词检索 -->
 			and(f.FOREIGN_KEY in
@@ -185,8 +187,8 @@
 		left join SYS_USER u on u.USER_ID = f.USER_ID
 		left join bus_specialuser su on su.SPECIALUSER_ID = f.USER_ID
 		left join oa_department dept on dept.DEPARTMENT_ID = u.DEPARTMENT_ID
-		left join `qa-czks-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin'
+		left join `qa-gwj-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin'
-		left join `qa-czks-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID
+		left join `qa-gwj-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID
 		where f.ISDELETE = '0'
 		<if test="hotIds != null and hotIds.size>0"><!-- 关键词检索 -->
 			and(f.FOREIGN_KEY in
@@ -216,7 +218,7 @@
 		    f.OPERATTIME,
 		    s.NAME,
 		    f.TYPE,
-			u.NAME as USER_NAME,
+			if(u.NAME is null,od.NAME,u.NAME) as USER_NAME,
 			su.USERNAME as SPECIAL_USER_NAME,
 			reuser.NAME as REGULATORY_USER_NAME
 		FROM
@@ -224,7 +226,9 @@
 			left join bus_hotworkapplicationstate s on s.STATE = f.STATE
 			left join SYS_USER u on u.USER_ID = f.USER_ID
 			left join bus_specialuser su on su.SPECIALUSER_ID = f.USER_ID
-			left join `qa-czks-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin'
+			left join `qa-gwj-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin'
+			left join oa_department od on od.DEPARTMENT_ID = f.USER_ID
+			left join `qa-gwj-regulatory`.SYS_DEPARTMENT rd on rd.DEPARTMENT_ID = f.USER_ID
 		WHERE
 		    f.FOREIGN_KEY = #{FOREIGN_KEY}
 	  		AND f.ISDELETE = '0'
@@ -336,8 +340,8 @@
 		left join SYS_USER u on u.DEPARTMENT_ID = f.USER_ID
 		left join bus_specialuser su on su.SPECIALUSER_ID = f.USER_ID
 		left join oa_department dept on dept.DEPARTMENT_ID = u.DEPARTMENT_ID
-		left join `qa-czks-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin'
+		left join `qa-gwj-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin'
-		left join `qa-czks-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID
+		left join `qa-gwj-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID
 		where f.ISDELETE = '0'
 		<if test="hotIds != null and hotIds.size>0"> <!-- 关键词检索 -->
 			and(f.FOREIGN_KEY in

src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml

@@ -9,7 +9,7 @@
 
 	<!--数据字典表名 -->
 	<sql id="dicTableName">
-		`qa-czks-prevention`.sys_dictionaries
+		`qa-gwj-prevention`.sys_dictionaries
 	</sql>
 	<!-- 字段 -->
 	<sql id="Field">
@@ -295,14 +295,14 @@
 		p.NAME as RECTIFICATIONOR_NAME
 		from
 		<include refid="tableName"></include> f
-		left join `qa-czks-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART
+		left join `qa-gwj-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART
 		left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
 		left join <include refid="dicTableName"></include> ht on f.HIDDENTYPE = ht.BIANMA
 		left join <include refid="dicTableName"></include> ht2 on f.HIDDENTYPE2 = ht2.BIANMA and ht2.PARENT_ID = '18c0a9aea6e54feab9f4ab3f46e0bc86'
-		left join `qa-czks-prevention`.oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
+		left join `qa-gwj-prevention`.oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
-		left join `qa-czks-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR
+		left join `qa-gwj-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR
-		left join `qa-czks-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT
+		left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT
-		left join `qa-czks-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR
+		left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR
 		where
 		f.HIDDEN_ID = #{HIDDEN_ID}
 	</select>
@@ -326,28 +326,28 @@
 		from
 		<include refid="tableName"></include> f
 		LEFT JOIN BUS_KEYPROJECTCHECK ch ON ch.OUTSOURCED_ID = f.FOREIGN_ID or  f.FOREIGN_ID = ch.KEYPROJECTCHECK_ID
-		LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED bo ON bo.OUTSOURCED_ID = ch.OUTSOURCED_ID <!-- 用于安全环保检查隐患的重点工程名称 -->
+		LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON bo.OUTSOURCED_ID = ch.OUTSOURCED_ID <!-- 用于安全环保检查隐患的重点工程名称 -->
-		left join `qa-czks-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART
+		left join `qa-gwj-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART
 		left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
 		left join <include refid="dicTableName"></include> ht on f.HIDDENTYPE = ht.BIANMA
 		left join <include refid="dicTableName"></include> ht2 on f.HIDDENTYPE2 = ht2.BIANMA and ht2.PARENT_ID = '18c0a9aea6e54feab9f4ab3f46e0bc86'
-		left join `qa-czks-prevention`.oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
+		left join `qa-gwj-prevention`.oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
-		left join `qa-czks-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR
+		left join `qa-gwj-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR
-		left join `qa-czks-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT
+		left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT
-		left join `qa-czks-regulatory`.BUS_OUTSOURCED o on o.UNITS_ID = u.UNITS_ID
+		left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on o.UNITS_ID = u.UNITS_ID
-		LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED bod ON bod.OUTSOURCED_ID = f.FOREIGN_ID <!-- 用于AI隐患的重点工程名称 -->
+		LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bod ON bod.OUTSOURCED_ID = f.FOREIGN_ID <!-- 用于AI隐患的重点工程名称 -->
-		left join `qa-czks-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR
+		left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR
 		left join BUS_KEYPROJECTPUNISH pu on pu.HIDDEN_ID = f.HIDDEN_ID
 		<if test="pd.CREATOR != null and pd.CREATOR !=''" >
 		left join (
 		SELECT
 		f.HIDDEN_ID
 		FROM
-		`qa-czks-prevention`.BUS_KEYPROJECT_HIDDEN f
+		`qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f
-		LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
+		LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
-		LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
+		LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
-		LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
+		LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
-		LEFT JOIN `qa-czks-prevention`.BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID
+		LEFT JOIN `qa-gwj-prevention`.BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID
 		WHERE
 		f.ISDELETE = '0'
 		AND f.SOURCE IN ( '4', '5', '1' )
@@ -417,10 +417,10 @@
 		from
 		<include refid="tableName"></include> f
 		left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID
-		left join `qa-czks-regulatory`.BUS_CORPTYPE type on type.CORPTYPE_ID = c.CORP_OF_TYPE
+		left join `qa-gwj-regulatory`.BUS_CORPTYPE type on type.CORPTYPE_ID = c.CORP_OF_TYPE
-		left join `qa-czks-prevention`.sys_dictionaries city on city.BIANMA = c.CITY
+		left join `qa-gwj-prevention`.sys_dictionaries city on city.BIANMA = c.CITY
-		left join `qa-czks-prevention`.sys_dictionaries country on country.BIANMA = c.COUNTRY
+		left join `qa-gwj-prevention`.sys_dictionaries country on country.BIANMA = c.COUNTRY
-		left join `qa-czks-prevention`.sys_dictionaries village on village.BIANMA = c.VILLAGE
+		left join `qa-gwj-prevention`.sys_dictionaries village on village.BIANMA = c.VILLAGE
 
 		left join sys_user cr on cr.USER_ID = f.CREATOR
 		left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
@@ -466,10 +466,10 @@
 		from
 		<include refid="tableName"></include> f
 		left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID
-		left join `qa-czks-regulatory`.BUS_CORPTYPE type on type.CORPTYPE_ID = c.CORP_OF_TYPE
+		left join `qa-gwj-regulatory`.BUS_CORPTYPE type on type.CORPTYPE_ID = c.CORP_OF_TYPE
-		left join `qa-czks-prevention`.sys_dictionaries city on city.BIANMA = c.CITY
+		left join `qa-gwj-prevention`.sys_dictionaries city on city.BIANMA = c.CITY
-		left join `qa-czks-prevention`.sys_dictionaries country on country.BIANMA = c.COUNTRY
+		left join `qa-gwj-prevention`.sys_dictionaries country on country.BIANMA = c.COUNTRY
-		left join `qa-czks-prevention`.sys_dictionaries village on village.BIANMA = c.VILLAGE
+		left join `qa-gwj-prevention`.sys_dictionaries village on village.BIANMA = c.VILLAGE
 
 		left join sys_user cr on cr.USER_ID = f.CREATOR
 		left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
@@ -602,7 +602,7 @@
 			IFNULL( h.NUM1, 0 ) NUM1,
 			IFNULL( h.NUM2, 0 ) NUM2
 		FROM
-			`qa-czks-prevention`.sys_dictionaries d
+			`qa-gwj-prevention`.sys_dictionaries d
 			LEFT JOIN (
 				SELECT
 					COUNT( f.STATE = 4 OR NULL ) AS NUM1,
@@ -646,10 +646,10 @@
 		from
 		<include refid="tableName"></include> f
 		left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID
-		left join `qa-czks-regulatory`.BUS_CORPTYPE type on type.CORPTYPE_ID = c.CORP_OF_TYPE
+		left join `qa-gwj-regulatory`.BUS_CORPTYPE type on type.CORPTYPE_ID = c.CORP_OF_TYPE
-		left join `qa-czks-prevention`.sys_dictionaries city on city.BIANMA = c.CITY
+		left join `qa-gwj-prevention`.sys_dictionaries city on city.BIANMA = c.CITY
-		left join `qa-czks-prevention`.sys_dictionaries country on country.BIANMA = c.COUNTRY
+		left join `qa-gwj-prevention`.sys_dictionaries country on country.BIANMA = c.COUNTRY
-		left join `qa-czks-prevention`.sys_dictionaries village on village.BIANMA = c.VILLAGE
+		left join `qa-gwj-prevention`.sys_dictionaries village on village.BIANMA = c.VILLAGE
 
 		left join sys_user cr on cr.USER_ID = f.CREATOR
 		left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
@@ -967,11 +967,11 @@
         count(CASE WHEN h.HIDDEN_ID != '' THEN 1 ELSE NULL END) as SBHD_NUM,
         count(case when h.STATE=4 then 1 else null end) as ZGHD_NUM
         <if test="DEPT_COUNTRY == null or DEPT_COUNTRY == ''">
-            from `qa-czks-prevention`.sys_dictionaries country
+            from `qa-gwj-prevention`.sys_dictionaries country
             LEFT join bus_corp_info f on country.BIANMA = f.COUNTRY and f.ISDELETE='0'
         </if>
         <if test="DEPT_COUNTRY != null and DEPT_COUNTRY != ''">
-            from `qa-czks-prevention`.sys_dictionaries village
+            from `qa-gwj-prevention`.sys_dictionaries village
             LEFT join bus_corp_info f on village.BIANMA = f.VILLAGE and f.ISDELETE='0'
         </if>
         <if test="DEPT_PROVINCE != null and DEPT_PROVINCE != ''">
@@ -987,7 +987,7 @@
             and f.VILLAGE = #{DEPT_VILLAGE}
         </if>
         <if test="DEPARTMENT_ID != null and DEPARTMENT_ID != ''">
-            and f.CORP_OF_TYPE in (select CORPTYPE_ID from `qa-czks-regulatory`.BUS_CORPTYPETODEPT ctod where ctod.DEPARTMENT_ID=#{DEPARTMENT_ID})
+            and f.CORP_OF_TYPE in (select CORPTYPE_ID from `qa-gwj-regulatory`.BUS_CORPTYPETODEPT ctod where ctod.DEPARTMENT_ID=#{DEPARTMENT_ID})
         </if>
 
         left join BUS_HIDDEN h on f.CORPINFO_ID=h.CORPINFO_ID and h.ISDELETE='0'
@@ -997,7 +997,7 @@
             and country.PARENT_ID = #{CITY_CODE}
         </if>
         <if test="DEPT_COUNTRY != null and DEPT_COUNTRY != ''">
-            and village.PARENT_ID in (select DICTIONARIES_ID from `qa-czks-prevention`.sys_dictionaries dic where dic.BIANMA=#{DEPT_COUNTRY})
+            and village.PARENT_ID in (select DICTIONARIES_ID from `qa-gwj-prevention`.sys_dictionaries dic where dic.BIANMA=#{DEPT_COUNTRY})
         </if>
 
         <if test="DEPT_COUNTRY == null or DEPT_COUNTRY == ''">
@@ -1132,15 +1132,15 @@
 		p.NAME as RECTIFICATIONOR_NAME
 		from
 		<include refid="tableName"></include> f
-		left join `qa-czks-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART
+		left join `qa-gwj-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART
 		left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
 		left join <include refid="dicTableName"></include> ht on f.HIDDENTYPE = ht.BIANMA
 		left join <include refid="dicTableName"></include> ht2 on f.HIDDENTYPE2 = ht2.BIANMA and ht2.PARENT_ID = '18c0a9aea6e54feab9f4ab3f46e0bc86'
-		left join `qa-czks-prevention`.oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
+		left join `qa-gwj-prevention`.oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
-		left join `qa-czks-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR
+		left join `qa-gwj-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR
-		left join `qa-czks-regulatory`.sys_user cre on cre.USER_ID = f.CREATOR
+		left join `qa-gwj-regulatory`.sys_user cre on cre.USER_ID = f.CREATOR
-		left join `qa-czks-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT
+		left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT
-		left join `qa-czks-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR
+		left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR
 		where f.ISDELETE = '0'
 		<if test="FOREIGN_ID != null and FOREIGN_ID !=''" >
 			and f.FOREIGN_ID = #{FOREIGN_ID}
@@ -1525,14 +1525,15 @@
 		SELECT
 		f.HIDDEN_ID,ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) OUTSOURCED_ID
 		FROM
-		`qa-czks-prevention`.BUS_KEYPROJECT_HIDDEN f
+		`qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f
-		LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
+		LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
-		LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
+		LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
-		LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
+		LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
 		WHERE
 		f.ISDELETE = '0'
 		AND f.SOURCE IN ( '4', '5', '1' )
 		AND ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) IS NOT NULL
+		AND (bo.ISDELETE = '0' or boai.ISDELETE = '0')
 		and f.ISPUNISH is null
 		and (
 		bo.PUNISH_THE_PERSON LIKE CONCAT( CONCAT( '%', #{loginUserId} ), '%' )
@@ -1544,9 +1545,9 @@
 		f.HIDDEN_ID
 		FROM
 		BUS_KEYPROJECT_HIDDEN f
-		LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
+		LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
-		LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
+		LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
-		LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
+		LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
 		LEFT JOIN BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID
 		WHERE
 		f.ISDELETE = '0'
@@ -1554,14 +1555,28 @@
 		AND f.STATE = '2'
 		AND f.CREATOR = #{loginUserId}
 		AND ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) IS NOT NULL
-		) t)CF_COUNT
+		AND (bo.ISDELETE = '0' or boai.ISDELETE = '0')
-		from `qa-czks-regulatory`.bus_aiwarning f
+		) t)CF_COUNT,
+			(SELECT
+	COUNT( DISTINCT t.OUTSOURCED_ID )
+FROM
+	(
+	SELECT
+		b.OUTSOURCED_ID
+	FROM
+		`qa-gwj-regulatory`.BUS_OUTSOURCED b
+	WHERE
+		b.ISDELETE = '0'
+		 AND ( b.STATE = '-1' OR b.STATE = '-2' )
+	AND b.CREATOR =  #{loginUserId}
+	) t) GC_COUNT
+		from `qa-gwj-regulatory`.bus_aiwarning f
 		where f.ISDELETE = '0'
 		  and f.STATUS = 0
 		  and VIDEOMANAGER_ID in (
 		      select vi.VIDEOMANAGER_ID
-								from `qa-czks-regulatory`.bus_aiwarning_people aip
+								from `qa-gwj-regulatory`.bus_aiwarning_people aip
-		      left join `qa-czks-regulatory`. bus_videomanager vi on vi.OUTSOURCED_ID = aip.OUTSOURCED_ID
+		      left join `qa-gwj-regulatory`. bus_videomanager vi on vi.OUTSOURCED_ID = aip.OUTSOURCED_ID
 								where aip.AIWARNING_PEOPLE = #{loginUserId}
 								  and aip.ISDELETE = 0
 		      )
@@ -1579,14 +1594,14 @@
 			vi.`NAME` as RECTIFICATIONOR_NAME,
 			h.*
 		FROM
-			`qa-czks-prevention`.bus_keyproject_hidden h
+			`qa-gwj-prevention`.bus_keyproject_hidden h
-			LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck c ON h.FOREIGN_ID = c.KEYPROJECTCHECK_ID
+			LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck c ON h.FOREIGN_ID = c.KEYPROJECTCHECK_ID
-			LEFT JOIN `qa-czks-prevention`.bus_keyprojectpunish p ON p.HIDDEN_ID = h.HIDDEN_ID
+			LEFT JOIN `qa-gwj-prevention`.bus_keyprojectpunish p ON p.HIDDEN_ID = h.HIDDEN_ID
-			LEFT JOIN `qa-czks-regulatory`.bus_units u ON h.RECTIFICATIONDEPT = u.UNITS_ID
+			LEFT JOIN `qa-gwj-regulatory`.bus_units u ON h.RECTIFICATIONDEPT = u.UNITS_ID
-			LEFT JOIN `qa-czks-regulatory`.bus_personnelmanagement per on per.PERSONNELMANAGEMENT_ID = p.PERSONNELMANAGEMENT_ID
+			LEFT JOIN `qa-gwj-regulatory`.bus_personnelmanagement per on per.PERSONNELMANAGEMENT_ID = p.PERSONNELMANAGEMENT_ID
-			LEFT JOIN `qa-czks-prevention`.vi_user_all v ON v.USER_ID = p.CREATOR
+			LEFT JOIN `qa-gwj-prevention`.vi_user_all v ON v.USER_ID = p.CREATOR
-			LEFT JOIN `qa-czks-prevention`.vi_user_all vv ON vv.USER_ID = h.PUNISH_PERSON
+			LEFT JOIN `qa-gwj-prevention`.vi_user_all vv ON vv.USER_ID = h.PUNISH_PERSON
-			LEFT JOIN `qa-czks-regulatory`.bus_personnelmanagement vi ON vi.PERSONNELMANAGEMENT_ID = h.RECTIFICATIONOR
+			LEFT JOIN `qa-gwj-regulatory`.bus_personnelmanagement vi ON vi.PERSONNELMANAGEMENT_ID = h.RECTIFICATIONOR
 		WHERE
 			h.ISDELETE = '0'
 			<if test="pd.HANDLED==1">
@@ -1608,7 +1623,7 @@
 	</select>
 
 	<select id="getPUNISHTHEPERSON" parameterType="pd" resultType="string">
-		SELECT gc.PUNISH_THE_PERSON PUNISH_THE_PERSON FROM `qa-czks-regulatory`.BUS_OUTSOURCED gc
+		SELECT gc.PUNISH_THE_PERSON PUNISH_THE_PERSON FROM `qa-gwj-regulatory`.BUS_OUTSOURCED gc
 		WHERE gc.OUTSOURCED_ID=#{OUTSOURCED_ID}
 		AND gc.IS_SMS = '0'
 	</select>

src/main/resources/mybatis/datasource/system/DepartmentMapper.xml

@@ -579,4 +579,17 @@
 			DEP_ORDER ASC,
 			name
 	</select>
+	<select id="listSubCorpDepartmentByParentId" parameterType="String" resultMap="departmentResultMap">
+		select * from `qa-gwj-regulatory`.SYS_DEPARTMENT
+		where 1=1
+		<if test="_parameter  != null and _parameter  != ''"><!-- 关键词检索 -->
+			and PARENT_ID = #{parentId}
+		</if>
+		order by DEP_ORDER asc, NAME
+	</select>
+	<select id="findByCorpDepartmentId" resultType="com.zcloud.entity.PageData">
+		select * from `qa-gwj-regulatory`.SYS_DEPARTMENT
+		where DEPARTMENT_ID = #{DEPARTMENT_ID}
+		order by DEP_ORDER asc, NAME
+	</select>
 </mapper>

src/main/resources/mybatis/datasource/system/UsersMapper.xml

@@ -91,7 +91,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		JCR,
 		CORPINFO_ID,
 		CARDNO,
-		USER_IDENTITY,
 		ISDELETE
 	</sql>
 	<!-- 字段 -->
@@ -132,7 +131,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		f.JCR,
 		f.CORPINFO_ID,
 		f.CARDNO,
-		f.USER_IDENTITY,
 		f.ISDELETE
 	</sql>
 	<!-- 字段值 -->
@@ -170,7 +168,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		#{JCR},
 		#{CORPINFO_ID},
 		#{CARDNO},
-		#{USER_IDENTITY},
 		#{ISDELETE}
 	</sql>
 
@@ -346,8 +343,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
         oa.NAME as DEPTNAME,f.NAME,f.CORPINFO_ID
         from
-        `qa-czks-prevention`.sys_user f
+        `qa-gwj-prevention`.sys_user f
-        left join `qa-czks-prevention`.oa_department oa on oa.DEPARTMENT_ID = f.DEPARTMENT_ID
+        left join `qa-gwj-prevention`.oa_department oa on oa.DEPARTMENT_ID = f.DEPARTMENT_ID
         where
         USER_ID = #{USER_ID}
 
@@ -1127,7 +1124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select
 		*
 		from
-		`qa-czks-regulatory`.SYS_USER
+		`qa-gwj-regulatory`.SYS_USER
 		where USER_ID = #{USER_ID}
 	</select>
 	<select id="userlistAll" parameterType="pd" resultType="pd">
@@ -1170,8 +1167,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		u.USER_ID,
 		u.USERNAME,
 		u.NAME
-		from `qa-czks-regulatory`.sys_user u
+		from `qa-gwj-regulatory`.sys_user u
-		left join `qa-czks-regulatory`.SYS_ROLE r on u.ROLE_ID = r.ROLE_ID
+		left join `qa-gwj-regulatory`.SYS_ROLE r on u.ROLE_ID = r.ROLE_ID
 		where u.USERNAME != 'admin' and u.ISDELETE = '0'
 		and r.PARENT_ID = '1'
 		<if test="DEPARTMENT_ID != null and DEPARTMENT_ID != ''"><!-- 用户部门 -->
@@ -1182,7 +1179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		u.USER_ID,
 		u.USERNAME,
 		u.NAME
-		from `qa-czks-prevention`.sys_user u, `qa-czks-prevention`.sys_role r
+		from `qa-gwj-prevention`.sys_user u, `qa-gwj-prevention`.sys_role r
 		where u.ROLE_ID = r.ROLE_ID
 		and u.USERNAME != 'admin' and u.ISDELETE = '0'
 		<!--    and r.PARENT_ID = '1' -->
@@ -1285,7 +1282,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   PASSWORD,
 			   DEPARTMENT_ID,
 			   NAME
-		from `qa-czks-prevention`.SYS_USER
+		from `qa-gwj-prevention`.SYS_USER
 		where CORPINFO_ID = #{CORPINFO_ID}
 		  and ISMAIN = '1'
 		  and ISDELETE = '0'
@@ -1297,8 +1294,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			f.DEPARTMENT_ID,
 			f.USER_ID,
 			sd.name as punishname
-			from `qa-czks-regulatory`.sys_user f
+			from `qa-gwj-regulatory`.sys_user f
-			LEFT JOIN `qa-czks-prevention`.vi_department_all sd ON sd.DEPARTMENT_ID = f.DEPARTMENT_ID
+			LEFT JOIN `qa-gwj-prevention`.vi_department_all sd ON sd.DEPARTMENT_ID = f.DEPARTMENT_ID
 			<foreach item="item" index="index" collection="ids" open="WHERE" separator="or">
 				<if test=" item != null and item != ''">
 					USER_ID like CONCAT(CONCAT('%', #{item}),'%')
@@ -1310,8 +1307,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			z.DEPARTMENT_ID,
 			z.USER_ID,
 			sd.name as punishname
-			from `qa-czks-prevention`.sys_user z
+			from `qa-gwj-prevention`.sys_user z
-			LEFT JOIN `qa-czks-prevention`.vi_department_all sd ON sd.DEPARTMENT_ID = z.DEPARTMENT_ID
+			LEFT JOIN `qa-gwj-prevention`.vi_department_all sd ON sd.DEPARTMENT_ID = z.DEPARTMENT_ID
 			<foreach item="item" index="index" collection="ids" open="WHERE" separator="or">
 				<if test=" item != null and item != ''">
 					USER_ID like CONCAT(CONCAT('%', #{item}),'%')
@@ -1331,77 +1328,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			</foreach>
 		</if>
     </select>
-    <select id="getPersonByCardNo" resultType="com.zcloud.entity.PageData">
+	<select id="getUsersInfo" resultType="com.zcloud.entity.PageData">
-		SELECT
+		select * from `qa-gwj-regulatory`.SYS_USER where ISDELETE = '0'
-			u.USER_ID,
+		<if test="USER_ID != null and USER_ID != ''">
-			u.NAME,
+			 and USER_ID = #{USER_ID}
-			u.USERNAME,
+		</if>
-			u.USERAVATARURL,
+		<if test="USER_IDS != null and USER_IDS != ''">
-			u.IS_HAZARDCONFIRMER,
+			and USER_ID in
-			u.PERSON_TYPE,
+			<foreach item="item" index="index" collection="USER_IDS" open="(" separator="," close=")">
-			d.`NAME` DEPARTMENT_NAME,
+				#{item}
-			p.`NAME` POST_NAME,
+			</foreach>
-			u.CARDNO,
+		</if>
-			c.CORP_NAME
+		<if test="DEPARTMENT_ID != null and DEPARTMENT_ID != null">
-		FROM
+			and DEPARTMENT_ID = #{DEPARTMENT_ID}
-			`qa-czks-prevention`.sys_user u
+		</if>
-				LEFT JOIN `qa-czks-prevention`.bus_corp_info c ON u.CORPINFO_ID = c.CORPINFO_ID
+		<if test="ISASSESS != null and ISASSESS != null">
-				LEFT JOIN `qa-czks-prevention`.sys_post p on u.POST_ID = p.POST_ID
+			and ISASSESS = #{ISASSESS}
-				LEFT JOIN `qa-czks-prevention`.oa_department d on u.DEPARTMENT_ID = d.DEPARTMENT_ID
+		</if>
-		WHERE
-			u.ISDELETE = 0 and
-			u.CARDNO = #{CARDNO}
-	</select>
-	<select id="findByCardNo" resultType="com.zcloud.entity.PageData">
-		select
-			u.USER_ID,
-			u.USERNAME,
-			u.PASSWORD,
-			u.NAME,
-			u.ROLE_ID,
-			u.LAST_LOGIN,
-			u.IP,
-			u.STATUS,
-			u.BZ,
-			u.SKIN,
-			u.EMAIL,
-			u.NUMBER,
-			u.PHONE,
-			u.ROLE_IDS,
-			u.DEPARTMENT_ID,
-			u.CORPINFO_ID,
-			u.FUN_IDS,
-			u.APPID,
-			u.POST_ID,
-			u.ISMAIN,
-			u.ERROR_COUNT,
-			u.SORT,
-			u.LEARNERCATEGORY,
-			u.USERAVATARPREFIX,
-			u.USERAVATARURL,
-			u.SHIFTDUTYONE,
-			u.SHIFTDUTYTWO,
-			u.DURATION,
-			u.WORKSTATUS,
-			u.WORKPERIOD,
-			u.IS_RECORDER,
-			u.PERSONNEL_TYPE,
-			u.IS_HAZARDCONFIRMER,
-			u.IS_ONLINELEARNING,
-			u.PERSON_TYPE,
-			u.JCR,
-			u.ISDELETE,
-			u.PUSH_CID,
-			u.EMPNO,
-			u.CFD_STATUS,
-			u.CARDNO,
-			d.NAME as DEPARTMENT_NAME,
-			p.NAME as POST_NAME
-		from
-			`qa-czks-prevention`.sys_user u
-				left join  `qa-czks-prevention`oa_department d on d.DEPARTMENT_ID = u.DEPARTMENT_ID
-			left join  `qa-czks-prevention`sys_post p on p.POST_ID = u.POST_ID
-		where
-			u.CARDNO = #{CARDNO}
 	</select>
 </mapper>

src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml

@@ -4,7 +4,7 @@
 
 	<!--表名 -->
 	<sql id="tableName">
-		`qa-czks-regulatory`.BUS_OUTSOURCED
+		`qa-gwj-regulatory`.BUS_OUTSOURCED
 	</sql>
 
 	<!--数据字典表名 -->
@@ -237,17 +237,17 @@
 	<select id="findById" parameterType="pd" resultType="pd">
 		select
 		f.*,
-		(select GROUP_CONCAT(t.CORP_NAME) from `qa-czks-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.INVOLVING_CORPS)) as INVOLVING_CORPS_NAME,
+		(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.INVOLVING_CORPS)) as INVOLVING_CORPS_NAME,
-		( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-czks-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
+		( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
-		( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-czks-prevention`.vi_department_all t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
+		( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.vi_department_all t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
-		(select GROUP_CONCAT(t.CORP_NAME) from `qa-czks-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.GROUP_UNIT)) as GROUP_UNIT_NAME,
+		(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.GROUP_UNIT)) as GROUP_UNIT_NAME,
-		(select GROUP_CONCAT(t.CORP_NAME) from `qa-czks-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
+		(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
 		(select GROUP_CONCAT(t.NAME) from (
 			SELECT
 			CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME  ,t.DEPARTMENT_ID
 			FROM
-			`qa-czks-prevention`.OA_DEPARTMENT t
+			`qa-gwj-prevention`.OA_DEPARTMENT t
-			LEFT JOIN `qa-czks-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID
+			LEFT JOIN `qa-gwj-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID
 		) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME,
 		-- isd.NAME DEPARTMENT_NAME,
 		isdd.NAME MANAGER_DEPARTMENT_NAME,
@@ -260,14 +260,14 @@
 		p.`NAME` as UNITS_PIC_NAME
 		from
 		<include refid="tableName"></include> f
-		-- LEFT JOIN `qa-czks-prevention`.vi_department_all isd ON isd.DEPARTMENT_ID = f.DEPARTMENT_ID
+		-- LEFT JOIN `qa-gwj-prevention`.vi_department_all isd ON isd.DEPARTMENT_ID = f.DEPARTMENT_ID
-		LEFT JOIN `qa-czks-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
+		LEFT JOIN `qa-gwj-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
-		LEFT JOIN `qa-czks-prevention`.vi_user_all isu ON isu.USER_ID = f.CONTRACT_PIC
+		LEFT JOIN `qa-gwj-prevention`.vi_user_all isu ON isu.USER_ID = f.CONTRACT_PIC
-		LEFT JOIN `qa-czks-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
+		LEFT JOIN `qa-gwj-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
-		LEFT JOIN `qa-czks-prevention`.oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
+		LEFT JOIN `qa-gwj-prevention`.oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
-		LEFT JOIN `qa-czks-prevention`.oa_department pcijd ON pcijd.DEPARTMENT_ID = f.INVOLVING_CORPS_DEPART_ID
+		LEFT JOIN `qa-gwj-prevention`.oa_department pcijd ON pcijd.DEPARTMENT_ID = f.INVOLVING_CORPS_DEPART_ID
 		left join bus_units b using (UNITS_ID)
-		left join  `qa-czks-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
+		left join  `qa-gwj-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
 		where
 			f.OUTSOURCED_ID = #{OUTSOURCED_ID}
 			and f.ISDELETE = '0'
@@ -277,63 +277,42 @@
 	<select id="datalistPage" parameterType="page" resultType="pd">
 		select
 		f.*,
-		(select GROUP_CONCAT(t.CORP_NAME) from `qa-czks-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.INVOLVING_CORPS)) as INVOLVING_CORPS_NAME,
+		(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.INVOLVING_CORPS)) as INVOLVING_CORPS_NAME,
-		(select GROUP_CONCAT(t.CORP_NAME) from `qa-czks-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
+		(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
-		( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-czks-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
+		( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
-		(select GROUP_CONCAT(t.CORP_NAME) from `qa-czks-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.GROUP_UNIT)) as GROUP_UNIT_NAME,
+		(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.GROUP_UNIT)) as GROUP_UNIT_NAME,
-		( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-czks-prevention`.vi_department_all t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
+		( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.vi_department_all t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
 
 		(select GROUP_CONCAT(t.NAME) from (
 		SELECT
 		CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME  ,t.DEPARTMENT_ID
 		FROM
-		`qa-czks-prevention`.OA_DEPARTMENT t
+		`qa-gwj-prevention`.OA_DEPARTMENT t
-		LEFT JOIN `qa-czks-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID
+		LEFT JOIN `qa-gwj-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID
 		) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME,
 		isdd.NAME MANAGER_DEPARTMENT_NAME,
 		isu.NAME USER_NAME,
 		b.UNITS_NAME as UNITS_NAME,
 		isu.NAME as AIWARNING_PEOPLE,
 		pci.NAME Q_COMPETENT_DEPT_NAME,
-		(select count(1) from `qa-czks-prevention`.BUS_KEYPROJECTCHECK c where c.OUTSOURCED_ID = f.OUTSOURCED_ID) as CHECK_COUNT,
+		cc.co as CHECK_COUNT,
-		(select count(1) from `qa-czks-regulatory`.BUS_AIWARNING a left join bus_videomanager avid on avid.VIDEOMANAGER_ID = a.VIDEOMANAGER_ID where  avid.OUTSOURCED_ID= f.OUTSOURCED_ID and a.ISDELETE = '0') as AI_COUNT,
+		(select count(1) from `qa-gwj-regulatory`.BUS_AIWARNING a left join bus_videomanager avid on avid.VIDEOMANAGER_ID = a.VIDEOMANAGER_ID where  avid.OUTSOURCED_ID= f.OUTSOURCED_ID and a.ISDELETE = '0') as AI_COUNT,
-		(select count(1) from `qa-czks-regulatory`.BUS_VIDEOMANAGER v where v.OUTSOURCED_ID = f.OUTSOURCED_ID and v.ISDELETE = '0') as VIDEO_COUNT,
+		(select count(1) from `qa-gwj-regulatory`.BUS_VIDEOMANAGER v where v.OUTSOURCED_ID = f.OUTSOURCED_ID and v.ISDELETE = '0') as VIDEO_COUNT,
-		(SELECT count( 1 ) FROM `qa-czks-prevention`.BUS_KEYPROJECTPUNISH k left join `qa-czks-prevention`.bus_keyprojectcheck kjc on kjc.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID WHERE  kjc.OUTSOURCED_ID =f.OUTSOURCED_ID   AND k.ISDELETE = '0' ) as KEY_COUNT,
+		(SELECT count( 1 ) FROM `qa-gwj-prevention`.BUS_KEYPROJECTPUNISH k left join `qa-gwj-prevention`.bus_keyprojectcheck kjc on kjc.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID WHERE  kjc.OUTSOURCED_ID =f.OUTSOURCED_ID   AND k.ISDELETE = '0' ) as KEY_COUNT,
 		vua.NAME OUTSOURCED_CREATOR_NAME,
 		ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME,
 		p.`NAME` as UNITS_PIC_NAME
-		<if test="pd.UserId  != null and pd.UserId   !=''">
-		,ifnull(dbsl.co,0) as co
-		</if>
 		from
 		<include refid="tableName"></include> f
 		left join bus_units b using (UNITS_ID)
-		LEFT JOIN `qa-czks-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
+		LEFT JOIN `qa-gwj-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
-		LEFT JOIN `qa-czks-regulatory`.SYS_USER isu ON isu.USER_ID = f.CONTRACT_PIC
+		LEFT JOIN `qa-gwj-regulatory`.SYS_USER isu ON isu.USER_ID = f.CONTRACT_PIC
-        LEFT JOIN `qa-czks-prevention`.oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
+        LEFT JOIN `qa-gwj-prevention`.oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
-		LEFT JOIN `qa-czks-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
+		LEFT JOIN `qa-gwj-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
-		LEFT JOIN `qa-czks-prevention`.vi_user_all vua on f.CREATOR = vua.USER_ID
+		LEFT JOIN `qa-gwj-prevention`.vi_user_all vua on f.CREATOR = vua.USER_ID
-		LEFT JOIN `qa-czks-regulatory`.vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID
+		LEFT JOIN `qa-gwj-regulatory`.vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID
-		left join  `qa-czks-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
+		left join  `qa-gwj-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
-		-- 这个判断是隐患管理排序以及隐患管理的角标
+		LEFT JOIN ( select count(c.KEYPROJECTCHECK_ID) co, c.OUTSOURCED_ID   from `qa-gwj-prevention`.BUS_KEYPROJECTCHECK c where c.ISDELETE = '0' group by  c.OUTSOURCED_ID )  cc on cc.OUTSOURCED_ID = f.OUTSOURCED_ID
-		<if test="pd.UserId  != null and pd.UserId   !=''">
-		left join (SELECT t.OUTSOURCED_ID,COUNT( distinct t.HIDDEN_ID) co  FROM (
-		SELECT
-		f.HIDDEN_ID,ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) OUTSOURCED_ID
-		FROM
-		`qa-czks-prevention`.BUS_KEYPROJECT_HIDDEN f
-		LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
-		LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
-		LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
-		LEFT JOIN `qa-czks-prevention`.BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID
-		WHERE
-		f.ISDELETE = '0'
-		AND f.SOURCE IN ( '4', '5', '1' )
-		AND f.STATE = '2'
-		AND f.CREATOR = #{pd.UserId}
-		AND ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) IS NOT NULL
-		) t GROUP BY t.OUTSOURCED_ID ) dbsl on dbsl.OUTSOURCED_ID = f.OUTSOURCED_ID
-		</if>
 		where f.ISDELETE = '0'
 		<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 关键词检索 -->
 			and
@@ -396,9 +375,7 @@
 			)
 		</if>
 		ORDER BY
-		<if test="pd.UserId  != null and pd.UserId   !=''">
+			cc.co DESC,
-			dbsl.co DESC,
-		</if>
 		   f.OPERATTIME DESC
 	</select>
 
@@ -406,7 +383,7 @@
 		SELECT
 			DEPARTMENT_ID
 			FROM
-			`qa-czks-prevention`.`sys_user`
+			`qa-gwj-prevention`.`sys_user`
 			WHERE
 			ISMAIN  = '0' and
 			`USER_ID` =#{userId}
@@ -487,24 +464,24 @@
 	<select id="getPUNISHlistPage" parameterType="page" resultType="pd">
 		select
 		f.*,
-		(select GROUP_CONCAT(t.CORP_NAME) from `qa-czks-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.INVOLVING_CORPS)) as INVOLVING_CORPS_NAME,
+		(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.INVOLVING_CORPS)) as INVOLVING_CORPS_NAME,
-		(select GROUP_CONCAT(t.CORP_NAME) from `qa-czks-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
+		(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
-		( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-czks-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
+		( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
-		( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-czks-prevention`.vi_department_all t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
+		( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.vi_department_all t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
 		(select GROUP_CONCAT(t.NAME) from (
 		SELECT
 		CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME  ,t.DEPARTMENT_ID
 		FROM
-		`qa-czks-prevention`.OA_DEPARTMENT t
+		`qa-gwj-prevention`.OA_DEPARTMENT t
-		LEFT JOIN `qa-czks-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID
+		LEFT JOIN `qa-gwj-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID
 		) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME,
 		isdd.NAME MANAGER_DEPARTMENT_NAME,
 		isu.NAME USER_NAME,
 		b.UNITS_NAME as UNITS_NAME,
 		isu.NAME as AIWARNING_PEOPLE,
 		pci.NAME Q_COMPETENT_DEPT_NAME,
-		(select count(1) from `qa-czks-regulatory`.BUS_AIWARNING a left join bus_videomanager avid on avid.VIDEOMANAGER_ID = a.VIDEOMANAGER_ID where  avid.OUTSOURCED_ID= f.OUTSOURCED_ID and a.ISDELETE = '0') as AI_COUNT,
+		(select count(1) from `qa-gwj-regulatory`.BUS_AIWARNING a left join bus_videomanager avid on avid.VIDEOMANAGER_ID = a.VIDEOMANAGER_ID where  avid.OUTSOURCED_ID= f.OUTSOURCED_ID and a.ISDELETE = '0') as AI_COUNT,
-		(SELECT count( 1 ) FROM `qa-czks-prevention`.BUS_KEYPROJECTPUNISH k left join `qa-czks-prevention`.bus_keyprojectcheck kjc on kjc.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID WHERE  kjc.OUTSOURCED_ID =f.OUTSOURCED_ID   AND k.ISDELETE = '0' ) as KEY_COUNT,
+		(SELECT count( 1 ) FROM `qa-gwj-prevention`.BUS_KEYPROJECTPUNISH k left join `qa-gwj-prevention`.bus_keyprojectcheck kjc on kjc.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID WHERE  kjc.OUTSOURCED_ID =f.OUTSOURCED_ID   AND k.ISDELETE = '0' ) as KEY_COUNT,
 		vua.NAME OUTSOURCED_CREATOR_NAME,
 		ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME,
 		p.`NAME` as UNITS_PIC_NAME
@@ -512,21 +489,21 @@
 		from
 		<include refid="tableName"></include> f
 		left join bus_units b using (UNITS_ID)
-		LEFT JOIN `qa-czks-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
+		LEFT JOIN `qa-gwj-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
-		LEFT JOIN `qa-czks-regulatory`.SYS_USER isu ON isu.USER_ID = f.CONTRACT_PIC
+		LEFT JOIN `qa-gwj-regulatory`.SYS_USER isu ON isu.USER_ID = f.CONTRACT_PIC
-		LEFT JOIN `qa-czks-prevention`.oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
+		LEFT JOIN `qa-gwj-prevention`.oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
-		LEFT JOIN `qa-czks-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
+		LEFT JOIN `qa-gwj-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
-		LEFT JOIN `qa-czks-prevention`.vi_user_all vua on f.CREATOR = vua.USER_ID
+		LEFT JOIN `qa-gwj-prevention`.vi_user_all vua on f.CREATOR = vua.USER_ID
-		LEFT JOIN `qa-czks-regulatory`.vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID
+		LEFT JOIN `qa-gwj-regulatory`.vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID
-		left join  `qa-czks-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
+		left join  `qa-gwj-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
 		left join (SELECT PUN.OUTSOURCED_ID,COUNT( distinct PUN.HIDDEN_ID) co  FROM (
 		SELECT
 		f.HIDDEN_ID,ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) OUTSOURCED_ID
 		FROM
-		`qa-czks-prevention`.BUS_KEYPROJECT_HIDDEN f
+		`qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f
-		LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
+		LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
-		LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
+		LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
-		LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
+		LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
 		WHERE
 		f.ISDELETE = '0'
 		AND f.SOURCE IN ( '4', '5', '1' )
@@ -564,14 +541,14 @@
 		IFNULL( FK.fk, 0 ) fk,
 		IFNULL( AI.ai, 0 ) ai
 		FROM
-		`qa-czks-regulatory`.bus_outsourced o
+		`qa-gwj-regulatory`.bus_outsourced o
 		<!-- 检查待确认 -->
 		LEFT JOIN (
 		SELECT
 		COUNT( 1 ) qr,
 		c.OUTSOURCED_ID
 		FROM
-		`qa-czks-prevention`.bus_keyprojectcheck c
+		`qa-gwj-prevention`.bus_keyprojectcheck c
 		WHERE
 		c.INSPECTION_STATUS = 0
 		AND c.ISDELETE = 0
@@ -589,8 +566,8 @@
 		h.HIDDEN_ID,
 		IFNULL( c.OUTSOURCED_ID, h.FOREIGN_ID ) OUTSOURCED_ID
 		FROM
-		`qa-czks-prevention`.bus_keyproject_hidden h
+		`qa-gwj-prevention`.bus_keyproject_hidden h
-		LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck c ON h.FOREIGN_ID = c.KEYPROJECTCHECK_ID
+		LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck c ON h.FOREIGN_ID = c.KEYPROJECTCHECK_ID
 		WHERE
 		h.STATE = 1
 		AND h.ISDELETE = 0
@@ -609,8 +586,8 @@
 		f.HIDDEN_ID,
 		IFNULL( c.OUTSOURCED_ID, f.FOREIGN_ID ) OUTSOURCED_ID
 		FROM
-		`qa-czks-prevention`.BUS_KEYPROJECT_HIDDEN f
+		`qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f
-		LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck c ON c.KEYPROJECTCHECK_ID = f.FOREIGN_ID
+		LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck c ON c.KEYPROJECTCHECK_ID = f.FOREIGN_ID
 		WHERE
 		f.ISDELETE = '0'
 		AND f.SOURCE IN ( '4', '5', '1' )
@@ -630,8 +607,8 @@
 		f.HIDDEN_ID,
 		IFNULL( c.OUTSOURCED_ID, f.FOREIGN_ID ) OUTSOURCED_ID
 		FROM
-		`qa-czks-prevention`.BUS_KEYPROJECT_HIDDEN f
+		`qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f
-		LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck c ON c.KEYPROJECTCHECK_ID = f.FOREIGN_ID
+		LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck c ON c.KEYPROJECTCHECK_ID = f.FOREIGN_ID
 		WHERE
 		f.ISDELETE = '0'
 		AND f.SOURCE IN ( '4', '5', '1' )
@@ -651,9 +628,9 @@
 		p.HIDDEN_ID,
 		IFNULL( c.OUTSOURCED_ID, f.FOREIGN_ID ) OUTSOURCED_ID
 		FROM
-		`qa-czks-prevention`.bus_keyprojectpunish p
+		`qa-gwj-prevention`.bus_keyprojectpunish p
-		LEFT JOIN `qa-czks-prevention`.BUS_KEYPROJECT_HIDDEN f on p.HIDDEN_ID = f.HIDDEN_ID
+		LEFT JOIN `qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f on p.HIDDEN_ID = f.HIDDEN_ID
-		LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck c ON c.KEYPROJECTCHECK_ID = f.FOREIGN_ID
+		LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck c ON c.KEYPROJECTCHECK_ID = f.FOREIGN_ID
 		WHERE
 		p.ISDELETE = '0'
 		AND p.HANDLED = '0'
@@ -666,14 +643,14 @@
 		SELECT
 		count( 1 ) AS ai ,t.OUTSOURCED_ID
 		FROM
-		`qa-czks-regulatory`.bus_aiwarning f
+		`qa-gwj-regulatory`.bus_aiwarning f
 		LEFT JOIN (
 		SELECT DISTINCT
 		vi.VIDEOMANAGER_ID,
 		aip.OUTSOURCED_ID
 		FROM
-		`qa-czks-regulatory`.bus_aiwarning_people aip
+		`qa-gwj-regulatory`.bus_aiwarning_people aip
-		LEFT JOIN `qa-czks-regulatory`.bus_videomanager vi ON vi.OUTSOURCED_ID = aip.OUTSOURCED_ID
+		LEFT JOIN `qa-gwj-regulatory`.bus_videomanager vi ON vi.OUTSOURCED_ID = aip.OUTSOURCED_ID
 		WHERE
 		aip.ISDELETE = 0
 		AND vi.VIDEOMANAGER_ID IS NOT NULL
@@ -697,4 +674,231 @@
 		where
 		OUTSOURCED_ID = #{OUTSOURCED_ID}
 	</update>
+
+
+	<!-- 列表 -->
+	<select id="hiddenOutsourcedlistPage" parameterType="page" resultType="pd">
+		select
+		f.*,
+		(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.INVOLVING_CORPS)) as INVOLVING_CORPS_NAME,
+		(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
+		( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
+		(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.GROUP_UNIT)) as GROUP_UNIT_NAME,
+		( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.vi_department_all t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
+
+		(select GROUP_CONCAT(t.NAME) from (
+		SELECT
+		CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME  ,t.DEPARTMENT_ID
+		FROM
+		`qa-gwj-prevention`.OA_DEPARTMENT t
+		LEFT JOIN `qa-gwj-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID
+		) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME,
+		isdd.NAME MANAGER_DEPARTMENT_NAME,
+		isu.NAME USER_NAME,
+		b.UNITS_NAME as UNITS_NAME,
+		isu.NAME as AIWARNING_PEOPLE,
+		pci.NAME Q_COMPETENT_DEPT_NAME,
+		(select count(1) from `qa-gwj-prevention`.BUS_KEYPROJECTCHECK c where c.OUTSOURCED_ID = f.OUTSOURCED_ID) as CHECK_COUNT,
+		(select count(1) from `qa-gwj-regulatory`.BUS_AIWARNING a left join bus_videomanager avid on avid.VIDEOMANAGER_ID = a.VIDEOMANAGER_ID where  avid.OUTSOURCED_ID= f.OUTSOURCED_ID and a.ISDELETE = '0') as AI_COUNT,
+		(select count(1) from `qa-gwj-regulatory`.BUS_VIDEOMANAGER v where v.OUTSOURCED_ID = f.OUTSOURCED_ID and v.ISDELETE = '0') as VIDEO_COUNT,
+		(SELECT count( 1 ) FROM `qa-gwj-prevention`.BUS_KEYPROJECTPUNISH k left join `qa-gwj-prevention`.bus_keyprojectcheck kjc on kjc.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID WHERE  kjc.OUTSOURCED_ID =f.OUTSOURCED_ID   AND k.ISDELETE = '0' ) as KEY_COUNT,
+		vua.NAME OUTSOURCED_CREATOR_NAME,
+		ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME,
+		p.`NAME` as UNITS_PIC_NAME
+		,ifnull(dbsl.co,0) as co
+		from
+		<include refid="tableName"></include> f
+		left join bus_units b using (UNITS_ID)
+		LEFT JOIN `qa-gwj-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
+		LEFT JOIN `qa-gwj-regulatory`.SYS_USER isu ON isu.USER_ID = f.CONTRACT_PIC
+		LEFT JOIN `qa-gwj-prevention`.oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
+		LEFT JOIN `qa-gwj-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
+		LEFT JOIN `qa-gwj-prevention`.vi_user_all vua on f.CREATOR = vua.USER_ID
+		LEFT JOIN `qa-gwj-regulatory`.vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID
+		left join  `qa-gwj-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
+		left join (SELECT t.OUTSOURCED_ID,COUNT( distinct t.HIDDEN_ID) co  FROM (
+		SELECT
+		f.HIDDEN_ID,ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) OUTSOURCED_ID
+		FROM
+		`qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f
+		LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
+		LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
+		LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
+		LEFT JOIN `qa-gwj-prevention`.BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID
+		WHERE
+		f.ISDELETE = '0'
+		AND f.SOURCE IN ( '4', '5', '1' )
+		AND f.STATE = '2'
+		AND f.CREATOR = #{pd.UserId}
+		AND ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) IS NOT NULL
+		) t GROUP BY t.OUTSOURCED_ID ) dbsl on dbsl.OUTSOURCED_ID = f.OUTSOURCED_ID
+		where f.ISDELETE = '0'
+		<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 关键词检索 -->
+			and
+			(
+			f.INVOLVING_CORPS LIKE CONCAT(CONCAT('%', #{pd.CORPINFO_ID}),'%')
+			or
+			f.GROUP_UNIT LIKE CONCAT(CONCAT('%', #{pd.CORPINFO_ID}),'%')
+			)
+		</if>
+		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
+			and
+			(
+			<!--	根据需求自己加检索条件-->
+			f.OUTSOURCED_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+			or
+			b.UNITS_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+			or
+			f.UNITS_PIC LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+			or
+			pcij.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+			)
+		</if>
+		<if test="pd.OUTSOURCED_NAME != null and pd.OUTSOURCED_NAME !=''">
+			and f.OUTSOURCED_NAME = #{pd.OUTSOURCED_NAME}
+		</if>
+		<if test="pd.UNITS_ID != null and pd.UNITS_ID !=''">
+			and f.UNITS_ID = #{pd.UNITS_ID}
+		</if>
+		<if test="pd.INVOLVING_CORP != null and pd.INVOLVING_CORP !=''">
+			and f.INVOLVING_CORPS LIKE CONCAT(CONCAT('%', #{pd.INVOLVING_CORP}),'%')
+		</if>
+		<if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID !=''">
+			and f.DEPARTMENT_ID LIKE CONCAT(CONCAT('%', #{pd.DEPARTMENT_ID}),'%')
+		</if>
+		<if test="pd.COMPETENT_DEPT_ID != null and pd.COMPETENT_DEPT_ID !=''">
+			and f.COMPETENT_DEPT_ID LIKE CONCAT(CONCAT('%', #{pd.COMPETENT_DEPT_ID}),'%')
+		</if>
+		<if test="pd.GROUP_UNIT != null and pd.GROUP_UNIT !=''">
+			and f.GROUP_UNIT LIKE CONCAT(CONCAT('%', #{pd.GROUP_UNIT}),'%')
+		</if>
+		<if test="pd.CORP_NAME != null and pd.CORP_NAME !=''">
+			and vac.CORP_NAME LIKE CONCAT(CONCAT('%', #{pd.CORP_NAME}),'%')
+		</if>
+		<if test="pd.STATE != null and pd.STATE !=''">
+			and f.STATE = #{pd.STATE}
+		</if>
+		<if test="pd.CONTRACT_STIME  != null and pd.CONTRACT_STIME   !=''">
+			and (f.CONTRACT_STIME between #{pd.CONTRACT_STIME} and #{pd.CONTRACT_ETIME}
+			or f.CONTRACT_ETIME between #{pd.CONTRACT_STIME} and #{pd.CONTRACT_ETIME}
+			or (f.CONTRACT_STIME &lt; #{pd.CONTRACT_STIME} and f.CONTRACT_ETIME &gt; #{pd.CONTRACT_ETIME}))
+		</if>
+		<if test="pd.DeptId  != null and pd.DeptId   !=''">
+			and ( f.DEPARTMENT_ID LIKE CONCAT(CONCAT('%', #{pd.DeptId}),'%')
+			or f.COMPETENT_DEPT_ID LIKE CONCAT(CONCAT('%',  #{pd.DeptId}),'%')
+			or f.INVOLVING_CORPS LIKE CONCAT(CONCAT('%',  #{pd.DeptId}),'%')
+			or f.INVOLVING_CORPS_DEPART_ID LIKE CONCAT(CONCAT('%', #{pd.DeptId}),'%')
+			or f.JURISDICTION_UNIT LIKE CONCAT(CONCAT('%', #{pd.DeptId}),'%')
+			or f.PUNISH_THE_PERSON LIKE CONCAT(CONCAT('%', #{pd.UserId}),'%')
+			or f.CREATOR = #{pd.UserId}
+			)
+		</if>
+		ORDER BY
+		dbsl.co DESC,
+		f.OPERATTIME DESC
+	</select>
+
+	<!-- 列表 -->
+	<select id="outSouceslistPage" parameterType="page" resultType="pd">
+		select
+		f.*,
+		(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.INVOLVING_CORPS)) as INVOLVING_CORPS_NAME,
+		(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
+		( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
+		(select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.GROUP_UNIT)) as GROUP_UNIT_NAME,
+		( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.vi_department_all t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
+
+		(select GROUP_CONCAT(t.NAME) from (
+		SELECT
+		CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME  ,t.DEPARTMENT_ID
+		FROM
+		`qa-gwj-prevention`.OA_DEPARTMENT t
+		LEFT JOIN `qa-gwj-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID
+		) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME,
+		isdd.NAME MANAGER_DEPARTMENT_NAME,
+		isu.NAME USER_NAME,
+		b.UNITS_NAME as UNITS_NAME,
+		isu.NAME as AIWARNING_PEOPLE,
+		pci.NAME Q_COMPETENT_DEPT_NAME,
+		(select count(1) from `qa-gwj-regulatory`.BUS_AIWARNING a left join bus_videomanager avid on avid.VIDEOMANAGER_ID = a.VIDEOMANAGER_ID where  avid.OUTSOURCED_ID= f.OUTSOURCED_ID and a.ISDELETE = '0') as AI_COUNT,
+		(select count(1) from `qa-gwj-regulatory`.BUS_VIDEOMANAGER v where v.OUTSOURCED_ID = f.OUTSOURCED_ID and v.ISDELETE = '0') as VIDEO_COUNT,
+		(SELECT count( 1 ) FROM `qa-gwj-prevention`.BUS_KEYPROJECTPUNISH k left join `qa-gwj-prevention`.bus_keyprojectcheck kjc on kjc.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID WHERE  kjc.OUTSOURCED_ID =f.OUTSOURCED_ID   AND k.ISDELETE = '0' ) as KEY_COUNT,
+		vua.NAME OUTSOURCED_CREATOR_NAME,
+		ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME,
+		p.`NAME` as UNITS_PIC_NAME
+		from
+		<include refid="tableName"></include> f
+		left join bus_units b using (UNITS_ID)
+		LEFT JOIN `qa-gwj-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
+		LEFT JOIN `qa-gwj-regulatory`.SYS_USER isu ON isu.USER_ID = f.CONTRACT_PIC
+		LEFT JOIN `qa-gwj-prevention`.oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
+		LEFT JOIN `qa-gwj-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
+		LEFT JOIN `qa-gwj-prevention`.vi_user_all vua on f.CREATOR = vua.USER_ID
+		LEFT JOIN `qa-gwj-regulatory`.vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID
+		left join  `qa-gwj-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
+		where f.ISDELETE = '0'
+		<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 关键词检索 -->
+			and
+			(
+			f.INVOLVING_CORPS LIKE CONCAT(CONCAT('%', #{pd.CORPINFO_ID}),'%')
+			or
+			f.GROUP_UNIT LIKE CONCAT(CONCAT('%', #{pd.CORPINFO_ID}),'%')
+			)
+		</if>
+		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
+			and
+			(
+			<!--	根据需求自己加检索条件-->
+			f.OUTSOURCED_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+			or
+			b.UNITS_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+			or
+			f.UNITS_PIC LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+			or
+			pcij.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+			)
+		</if>
+		<if test="pd.OUTSOURCED_NAME != null and pd.OUTSOURCED_NAME !=''">
+			and f.OUTSOURCED_NAME = #{pd.OUTSOURCED_NAME}
+		</if>
+		<if test="pd.UNITS_ID != null and pd.UNITS_ID !=''">
+			and f.UNITS_ID = #{pd.UNITS_ID}
+		</if>
+		<if test="pd.INVOLVING_CORP != null and pd.INVOLVING_CORP !=''">
+			and f.INVOLVING_CORPS LIKE CONCAT(CONCAT('%', #{pd.INVOLVING_CORP}),'%')
+		</if>
+		<if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID !=''">
+			and f.DEPARTMENT_ID LIKE CONCAT(CONCAT('%', #{pd.DEPARTMENT_ID}),'%')
+		</if>
+		<if test="pd.COMPETENT_DEPT_ID != null and pd.COMPETENT_DEPT_ID !=''">
+			and f.COMPETENT_DEPT_ID LIKE CONCAT(CONCAT('%', #{pd.COMPETENT_DEPT_ID}),'%')
+		</if>
+		<if test="pd.GROUP_UNIT != null and pd.GROUP_UNIT !=''">
+			and f.GROUP_UNIT LIKE CONCAT(CONCAT('%', #{pd.GROUP_UNIT}),'%')
+		</if>
+		<if test="pd.CORP_NAME != null and pd.CORP_NAME !=''">
+			and vac.CORP_NAME LIKE CONCAT(CONCAT('%', #{pd.CORP_NAME}),'%')
+		</if>
+		<if test="pd.STATE != null and pd.STATE !=''">
+			and f.STATE = #{pd.STATE}
+		</if>
+		<if test="pd.CONTRACT_STIME  != null and pd.CONTRACT_STIME   !=''">
+			and (f.CONTRACT_STIME between #{pd.CONTRACT_STIME} and #{pd.CONTRACT_ETIME}
+			or f.CONTRACT_ETIME between #{pd.CONTRACT_STIME} and #{pd.CONTRACT_ETIME}
+			or (f.CONTRACT_STIME &lt; #{pd.CONTRACT_STIME} and f.CONTRACT_ETIME &gt; #{pd.CONTRACT_ETIME}))
+		</if>
+		<if test="pd.DeptId  != null and pd.DeptId   !=''">
+			and ( f.DEPARTMENT_ID LIKE CONCAT(CONCAT('%', #{pd.DeptId}),'%')
+			or f.COMPETENT_DEPT_ID LIKE CONCAT(CONCAT('%',  #{pd.DeptId}),'%')
+			or f.INVOLVING_CORPS LIKE CONCAT(CONCAT('%',  #{pd.DeptId}),'%')
+			or f.INVOLVING_CORPS_DEPART_ID LIKE CONCAT(CONCAT('%', #{pd.DeptId}),'%')
+			or f.JURISDICTION_UNIT LIKE CONCAT(CONCAT('%', #{pd.DeptId}),'%')
+			or f.PUNISH_THE_PERSON LIKE CONCAT(CONCAT('%', #{pd.UserId}),'%')
+			or f.CREATOR = #{pd.UserId}
+			)
+		</if>
+		ORDER BY
+		f.STATE,
+		f.OPERATTIME DESC
+	</select>
 </mapper>

src/main/resources/mybatis/dsno2/keyProjects/VideoManagerMapper.xml

@@ -291,4 +291,23 @@
 		where
 		OUTSOURCED_ID = #{OUTSOURCED_ID}
 	</update>
+
+
+	<!-- 列表 -->
+	<select id="dataApplistPage" parameterType="page" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where f.ISDELETE = '0'
+		<if test="pd.OUTSOURCED_ID != null and pd.OUTSOURCED_ID != ''"><!-- 关键词检索 -->
+			and f.OUTSOURCED_ID=#{pd.OUTSOURCED_ID}
+		</if>
+		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
+			and
+			(
+			f.VIDEONAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+			)
+		</if>
+	</select>
 </mapper>

更新.md

@@ -0,0 +1 @@
+升级内容： 企业端PC： 1、新增-三人以上风险分布图菜单-分公司进行上传维护 2、新增-人员聚集分布图菜单-分公司进行上传维护 3、新增-人员培训申请-分公司进行申请培训 4、新增-相关方人员撤场申请审批-分公司审批相关方人员撤回申请 监管端PC： 1、新增-三人以上风险分布图菜单，查看分公司数据 2、新增-人员聚集分布图菜单，查看分公司数据 3、优化-重点工程菜单-搜索条件可以手动输入,主管部门和监管部门可以选择全部企业 4、优化-入场告知培训管理-优化审核流程 相关方PC： 1、新增-人员推送申请-相关方对分公司推送人员 2、新增-人员撤回申请-相关方对分公司申请撤回人员 企业端APP： 1、优化-动火作业-监火改为选择部门 2、新增-查看重点工程监控视频 3、新增-重点工程创建人审核开工申请和结束申请 监管端APP： 1、新增-查看重点工程监控视频 2、新增-重点工程创建人审核开工申请和结束申请 一公司app： 1、新增-原来动火作业改为国标新动火作业审批流程