Merge remote-tracking branch 'origin/pet' into dev

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

@@ -99,7 +99,7 @@ public class AppHomeController extends BaseController {
 					if (isDelayedExist) {
 						for (PageData pageData : varList) {
 							if (StringUtils.equals(pageData.getString("STATE"), "10")) {
-								pageData.put("count", delayedCount.getString("count"));
+								pageData.put("count", Integer.parseInt(delayedCount.getString("count")));
 							}
 						}
 					} else {
@@ -159,7 +159,7 @@ public class AppHomeController extends BaseController {
 					if (isDelayedExist) {
 						for (PageData pageData : varList) {
 							if (StringUtils.equals(pageData.getString("STATE"), "10")) {
-								pageData.put("count", delayedCount.getString("count"));
+								pageData.put("count", Integer.parseInt(delayedCount.getString("count")));
 							}
 						}
 					} else {

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

@@ -1380,7 +1380,7 @@ public class AppHotWorkApplicationController extends BaseController {
 					if (isDelayedExist) {
 						for (PageData pageData : varList){
 							if (StringUtils.equals(pageData.getString("STATE"),"10")) {
-								pageData.put("count",delayedCount.getString("count"));
+								pageData.put("count",Integer.parseInt(delayedCount.getString("count")));
 							}
 						}
 					} else {

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

@@ -11,6 +11,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.zcloud.service.highriskwork.HotWorkApplicationService;
 import com.zcloud.util.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -41,6 +42,8 @@ public class AppHotWorkApplicationDelayedController extends BaseController {
 
 	@Autowired
 	private HotWorkApplicationDelayedService hotworkapplicationdelayedService;
+	@Autowired
+	private HotWorkApplicationService hotWorkApplicationService;
 
 	/**新增
 	 * @param
@@ -155,6 +158,9 @@ public class AppHotWorkApplicationDelayedController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		List<PageData>	varList = hotworkapplicationdelayedService.listAll(pd);	//列出HotWorkApplicationDelayed列表
+		// 获取动火作业的作业开始和结束时间
+		PageData data = hotWorkApplicationService.findById(pd);
+		map.put("data", data);
 		map.put("varList", varList);
 		map.put("page", page);
 		map.put("result", errInfo);

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

@@ -250,7 +250,6 @@ public class AIWarningController extends BaseController {
         if (user != null) {
             pd.put("NAME", user.getString("name"));
         }
-        pd.put("FOREIGN_ID", pd.getString("AIWARNING_ID"));
         pd.put("hiddenList", keyprojectHiddenService.listAllInspection(pd));
         map.put("pd", pd);
         map.put("result", errInfo);

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

@@ -1136,6 +1136,7 @@
 		from
 		<include refid="tableName"></include> f
 		left join `qa-gwj-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART
+		left join `qa-gwj-regulatory`.bus_aiwarning ai on ai.HIDDEN_IDS like CONCAT('%',f.HIDDEN_ID,'%')
 		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'
@@ -1145,15 +1146,8 @@
 		left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT
 		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 !=''" >
+		<if test="AIWARNING_ID != null and AIWARNING_ID !=''" >
-			and f.FOREIGN_ID = #{FOREIGN_ID}
+			and ai.AIWARNING_ID = #{AIWARNING_ID}
-		</if>
-		<!-- Ai报警信息专查 -->
-		<if test="AI_WARNING != null and AI_WARNING !=''" >
-			and f.HIDDEN_ID in
-			    <foreach collection="array" item="item" separator="," open="(" close = ")">
-					#{item}
-				</foreach>
 		</if>
 		<if test="KEYWORDS != null and KEYWORDS != ''"><!-- 关键词检索 -->
 			and
@@ -1554,7 +1548,18 @@
 		bo.PUNISH_THE_PERSON LIKE CONCAT( CONCAT( '%', #{loginUserId} ), '%' )
 		OR boai.PUNISH_THE_PERSON LIKE CONCAT( CONCAT( '%', #{loginUserId} ), '%' )
 		)
-	) t ) as HIDDEN_COUNT,
+	) t ) +
+	   (SELECT COUNT(t.HIDDEN_ID) FROM (
+	   SELECT
+		   f.HIDDEN_ID
+	   FROM
+		   `qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f
+	   WHERE
+		   f.ISDELETE = '0'
+		 AND f.SOURCE = '1'
+		 AND f.CREATOR = #{loginUserId}
+		 and f.ISPUNISH is null
+   ) t ) as HIDDEN_COUNT,
 		(	SELECT COUNT(DISTINCT t.HIDDEN_ID) FROM (
 		SELECT
 		f.HIDDEN_ID
@@ -1620,12 +1625,15 @@ FROM
 		WHERE
 			h.ISDELETE = '0'
 			<if test="pd.HANDLED==1">
-				and (P.HANDLED = '0' OR  P.HANDLED IS NULL)
+				and (P.HANDLED = '0' OR  P.HANDLED IS NULL OR h.ISPUNISH != '2')
 			</if>
 			<if test="pd.HANDLED==2">
 				and P.HANDLED = '1'
 			</if>
 			AND ( c.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} OR h.FOREIGN_ID =  #{pd.OUTSOURCED_ID} )
+		<if test="pd.CREATOR != null and pd.CREATOR != ''">
+			and h.CREATOR like (case when h.SOURCE = '1' then CONCAT('%', #{pd.CREATOR},'%') else '%' end)
+		</if>
 		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
 			and
 			(

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

@@ -173,7 +173,7 @@
 		left join `qa-gwj-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR
 		left join `qa-gwj-regulatory`.sys_user cre on cre.USER_ID = f.CREATOR
 		left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.UNITS_ID
-		left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on  o.OUTSOURCED_ID = k.OUTSOURCED_ID
+		left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on  (o.OUTSOURCED_ID = k.OUTSOURCED_ID OR o.OUTSOURCED_ID = f.KEYPROJECTCHECK_ID)
 		left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID
 		where f.ISDELETE = '0'
 		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
@@ -185,7 +185,7 @@
 			)
 		</if>
 		<if test="pd.OUTSOURCED_ID != null and pd.OUTSOURCED_ID !='' " >
-			and k.OUTSOURCED_ID = #{pd.OUTSOURCED_ID}
+			and (k.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} or f.KEYPROJECTCHECK_ID = #{pd.OUTSOURCED_ID})
 		</if>
 		<if test="pd.HANDLED != null and pd.HANDLED !='' and pd.HANDLED == 1" >
 			and f.HANDLED = 0