Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb into dev

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

@@ -534,19 +534,25 @@ public class AppKeyprojectCheckController extends BaseController {
 		return map;
 	}
 
-	/**
-	 * 去隐患页面获取数据
-	 *
+	/**去隐患页面获取数据
 	 * @param
 	 * @throws Exception
 	 */
-	@RequestMapping(value = "/keyProjectCount")
+	@RequestMapping(value="/keyProjectCount")
 	@ResponseBody
-	public Object keyProjectCount() throws Exception {
-		Map<String, Object> map = new HashMap<String, Object>();
+	public Object keyProjectCount() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		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 = keyprojectHiddenService.keyprojectcount(pd);	//根据ID读取
 		map.put("pd", pd);
 		map.put("result", errInfo);

src/main/java/com/zcloud/entity/hotWorkApplication/Node.java

@@ -187,9 +187,6 @@ public class Node {
             buffer.append("<br/>");
             buffer.append("指派人：");
             buffer.append(hiddeny.getString("YINNAME"));
-            buffer.append("<br/>(");
-            buffer.append(hiddeny.getString("CREATTIME"));
-            buffer.append(")");
 
         }
         this.text = buffer.toString();

src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java

@@ -153,7 +153,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
 				hidden.put("HIDDENDESCR", json.getString("HIDDENDESCR"));    //隐患描述
 				hidden.put("HIDDENPART", json.getString("HIDDENPART"));    //隐患部位
 				hidden.put("HIDDENLEVEL", json.getString("HIDDENLEVEL"));    //隐患级别
-				hidden.put("HIDDENTYPE_NAME", json.getString("HIDDENTYPE_NAME"));//隐患类型名称
+				hidden.put("HIDDENTYPE_NAME", StringUtils.isNotBlank(json.getString("HIDDENTYPENAME")) ? json.getString("HIDDENTYPENAME") : json.getString("HIDDENTYPE_NAME"));//隐患类型名称
 				hidden.put("LONGITUDE", json.getString("LONGITUDE"));    //隐患位置经度
 				hidden.put("LATITUDE", json.getString("LATITUDE"));    //隐患位置纬度
 				hidden.put("DISCOVERYTIME", json.getString("DISCOVERYTIME"));    //隐患发现时间

src/main/resources/mybatis/datasource/hidden/HiddenCheckMapper.xml

@@ -129,7 +129,7 @@
 		<include refid="tableName"></include> f
 		left join sys_user u on u.USER_ID = f.USER_ID
 		left join oa_department d on d.DEPARTMENT_ID = f.DEPARTMENT_ID
-		where 1=1
+		where 1=1 and f.USER_ID is not null  and f.USER_ID  !=''
 		<if test="HIDDEN_ID != null and HIDDEN_ID != ''"><!-- 关键词检索 -->
 			and
 				f.HIDDEN_ID=#{HIDDEN_ID}

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

@@ -1533,6 +1533,7 @@
 		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} ), '%' )
@@ -1554,7 +1555,21 @@
 		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')
+		) t)CF_COUNT,
+			(SELECT
+	COUNT( DISTINCT t.OUTSOURCED_ID )
+FROM
+	(
+	SELECT
+		b.OUTSOURCED_ID
+	FROM
+		BUS_OUTSOURCED b
+	WHERE
+		b.ISDELETE = '0'
+		 AND ( b.STATE = '-1' OR b.STATE = '-2' )
+	AND b.CREATOR =  #{loginUserId}
+	) t) GC_COUNT
 		from bus_aiwarning f
 		where f.ISDELETE = '0'
 		  and f.STATUS = 0

src/main/resources/mybatis/datasource/specialoperation/SpecialOperationsMapper.xml

@@ -184,7 +184,7 @@
 		left join sys_dictionaries o on o.DICTIONARIES_ID = f.OPERATIONITEM
 		left join bus_corp_info b on b.CORPINFO_ID = f.CORPINFO_ID
 		left join bus_units r on r.UNITS_ID = f.UNITS_ID
-		LEFT JOIN sys_user u on f.CREATOR = u.USERNAME
+		LEFT JOIN sys_user u on f.CREATOR = u.USERNAME and u.ISDELETE = '0'
 		LEFT JOIN bus_corp_info c on u.CORPINFO_ID = c.CORPINFO_ID
 		where f.ISDELETE = '0'
 		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->