From dfa5786ef31e0471b453d46ccd4d51f2e32676b8 Mon Sep 17 00:00:00 2001 From: water_xu Date: Mon, 13 May 2024 14:09:05 +0800 Subject: [PATCH 1/8] =?UTF-8?q?AI=E6=8A=A5=E8=AD=A6-=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86AI=E6=8A=A5=E8=AD=A6=E6=9F=A5=E7=9C=8B=E9=9A=90?= =?UTF-8?q?=E6=82=A3=E8=AF=A6=E6=83=85=E4=B8=8D=E5=9B=9E=E6=98=BE=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../keyProjects/AIWarningController.java | 1 - .../keyProjects/KeyprojectHiddenMapper.xml | 15 ++++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java b/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java index 93640606..c0048262 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java +++ b/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); diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml index 0437a004..5d83bc3d 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml @@ -1136,6 +1136,7 @@ from 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 lv on f.HIDDENLEVEL = lv.BIANMA left join ht on f.HIDDENTYPE = ht.BIANMA left join 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' - - and f.FOREIGN_ID = #{FOREIGN_ID} - - - - and f.HIDDEN_ID in - - #{item} - + + and ai.AIWARNING_ID = #{AIWARNING_ID} and @@ -1626,6 +1620,9 @@ FROM and P.HANDLED = '1' AND ( c.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} OR h.FOREIGN_ID = #{pd.OUTSOURCED_ID} ) + + and h.CREATOR like (case when h.SOURCE = '1' then CONCAT('%', #{pd.CREATOR},'%') else '%' end) + and ( From a4a548b890a25ace5eeeb1d28670be003653b407 Mon Sep 17 00:00:00 2001 From: water_xu Date: Mon, 13 May 2024 14:10:18 +0800 Subject: [PATCH 2/8] =?UTF-8?q?AI=E6=8A=A5=E8=AD=A6-=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86AI=E6=8A=A5=E8=AD=A6App=E7=AB=AF=E9=9A=90=E6=82=A3?= =?UTF-8?q?=E6=83=A9=E7=BD=9A=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml index 5d83bc3d..5eaa8221 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml @@ -1614,7 +1614,7 @@ FROM WHERE h.ISDELETE = '0' - and (P.HANDLED = '0' OR P.HANDLED IS NULL) + and (P.HANDLED = '0' OR P.HANDLED IS NULL) and (h.ISPUNISH != '2' or h.ISPUNISH is null) and P.HANDLED = '1' From a1b2789de2573a3508d33b107b70d0817d3ca0bf Mon Sep 17 00:00:00 2001 From: water_xu Date: Mon, 13 May 2024 15:41:19 +0800 Subject: [PATCH 3/8] =?UTF-8?q?AI=E6=8A=A5=E8=AD=A6-=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86AI=E6=8A=A5=E8=AD=A6App=E7=AB=AF=E8=A7=92=E6=A0=87?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../keyProjects/KeyprojectHiddenMapper.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml index 5eaa8221..ad9579ec 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml @@ -1548,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 From 6859510e02afa95593bc8d9dce0646b9788cf2b5 Mon Sep 17 00:00:00 2001 From: water_xu Date: Tue, 14 May 2024 17:20:59 +0800 Subject: [PATCH 4/8] =?UTF-8?q?AI=E6=8A=A5=E8=AD=A6-=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86AI=E6=8A=A5=E8=AD=A6PC=E7=AB=AF=E5=A4=84=E7=BD=9A?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml index 86f09deb..40d427f6 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml @@ -185,7 +185,7 @@ ) - and k.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} + and (k.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} or f.KEYPROJECTCHECK_ID = #{pd.OUTSOURCED_ID}) and f.HANDLED = 0 From c9e1d03e31bca4cb47f4f0cd9b13fbaa797c6664 Mon Sep 17 00:00:00 2001 From: water_xu Date: Wed, 15 May 2024 10:22:02 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B-?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=86=E5=A4=84=E7=BD=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=AD=E4=B8=8D=E6=98=BE=E7=A4=BAAI=E6=8A=A5=E8=AD=A6?= =?UTF-8?q?=E9=9A=90=E6=82=A3=E7=9A=84=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=90=8D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml index 40d427f6..10deed5c 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml +++ b/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' From 92ce672850953f2590841a3583e42311737f659e Mon Sep 17 00:00:00 2001 From: limingyu Date: Wed, 15 May 2024 10:38:15 +0800 Subject: [PATCH 6/8] =?UTF-8?q?app=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=BA=8B=E9=A1=B9=E6=98=BE=E7=A4=BA=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/controller/app/highriskwork/AppHomeController.java | 4 ++-- .../app/highriskwork/AppHotWorkApplicationController.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java index 1ff1699c..c43f5bba 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java +++ b/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 { diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java index 94ed8b8e..d50f23ff 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java +++ b/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 { From 93811083d88657452b77d2711d730a5eb559c37d Mon Sep 17 00:00:00 2001 From: water_xu Date: Wed, 15 May 2024 10:52:14 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B-?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=A4=84=E7=BD=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=B8=BA=E4=B8=8D=E5=A4=84=E7=BD=9A=E7=9A=84?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml index ad9579ec..28fef198 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml @@ -1625,7 +1625,7 @@ FROM WHERE h.ISDELETE = '0' - and (P.HANDLED = '0' OR P.HANDLED IS NULL) and (h.ISPUNISH != '2' or h.ISPUNISH is null) + and (P.HANDLED = '0' OR P.HANDLED IS NULL OR h.ISPUNISH != '2') and P.HANDLED = '1' From 304a261c351a1558d72e89977d917020f28a9a1f Mon Sep 17 00:00:00 2001 From: limingyu Date: Wed, 15 May 2024 17:40:56 +0800 Subject: [PATCH 8/8] =?UTF-8?q?app=E5=8A=A8=E7=81=AB=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=BB=B6=E6=97=B6=E7=9B=91=E7=81=AB=E5=9C=A8=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=BB=B6=E6=97=B6=E7=9B=91=E7=81=AB=E6=97=B6=EF=BC=8C=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E8=B6=85=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppHotWorkApplicationDelayedController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java index 81a82b4e..03118f40 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java +++ b/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 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);