From 1303054865f15d36b136ee46050b7bfd11f7ecce Mon Sep 17 00:00:00 2001 From: liujun Date: Fri, 10 May 2024 18:57:45 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1=E3=80=81=E5=AE=9A=E4=BD=8D=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=AB=AF=E5=8F=A3=E6=9B=B4=E6=96=B0=202=E3=80=81?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=B9=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java | 2 +- src/main/resources/application-master.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java index c95cdb52..a5940710 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java @@ -416,7 +416,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService { condition.put("TYPE", "1"); // 项目主管部门需处理数 List _belongingList = busHotworkCfdExamineMapper.findByCondition(condition); - List belongList = new ArrayList(); + List belongList = new ArrayList<>(); for (PageData x : _belongingList) { PageData condition1 = new PageData(); condition1.put("HOTWORK_ID", x.get("HOTWORK_ID")); diff --git a/src/main/resources/application-master.properties b/src/main/resources/application-master.properties index fb62718f..329416a5 100644 --- a/src/main/resources/application-master.properties +++ b/src/main/resources/application-master.properties @@ -57,7 +57,7 @@ spring.main.banner-mode=off preventionxgf.api.url=http://192.168.192.201:8993/qa-prevention-xgf/ qa-regulatory-gwj.api.url=http://192.168.192.201:8092/qa-regulatory-gwj/ -dw.url=http://192.168.192.201:8888/qa-dingWei-gwj/ +dw.url=http://192.168.192.201:8887/qa-dingWei-gwj/ #????? smb.host=192.168.192.201 From 633119aaf98d7e0165f91f905a9868039b6efc94 Mon Sep 17 00:00:00 2001 From: limingyu Date: Thu, 23 May 2024 16:11:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=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=88=97=E8=A1=A8sql?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../highriskwork/HotWorkApplicationMapper.xml | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml index 1f51a337..7758c8da 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml @@ -231,7 +231,16 @@ and f.HOTWORKAPPLICATION_ID in (select hu.FOREIGN_KEY from bus_hotworkapplicationuser hu LEFT JOIN vi_user_all bhuuser ON bhuuser.USER_ID = hu.USER_ID where bhuuser.DEPARTMENT_ID in (${pd.supDeparIds}) or u.DEPARTMENT_ID in (${pd.supDeparIds}) ) - and f.HOTWORKAPPLICATION_ID in (select hu.FOREIGN_KEY from bus_hotworkapplicationuser hu where hu.USER_ID = #{pd.loginUserId} + + + + and f.HOTWORKAPPLICATION_ID in (select hu.FOREIGN_KEY from bus_hotworkapplicationuser hu where hu.USER_ID = uu.DEPARTMENT_ID + + + and f.HOTWORKAPPLICATION_ID in (select hu.FOREIGN_KEY from bus_hotworkapplicationuser hu where hu.USER_ID = #{pd.loginUserId} + + + @@ -253,7 +262,16 @@ - and f.HOTWORKAPPLICATION_ID in (select hu.FOREIGN_KEY from bus_hotworkapplicationuser hu where hu.USER_ID = #{pd.myApprove} + + + + and f.HOTWORKAPPLICATION_ID in (select hu.FOREIGN_KEY from bus_hotworkapplicationuser hu where hu.USER_ID = uu.DEPARTMENT_ID + + + and f.HOTWORKAPPLICATION_ID in (select hu.FOREIGN_KEY from bus_hotworkapplicationuser hu where hu.USER_ID = #{pd.loginUserId} + + + @@ -279,18 +297,6 @@ and (u.NAME LIKE CONCAT(CONCAT('%', #{pd.applicantName}),'%')) - - - - - - - - - - - - and f.STATE = #{pd.keyState} @@ -326,7 +332,7 @@ and (f.STATE != '11') - ) or (uu.USER_ID is not null and f.ISDELETE = '0') + ) and (uu.USER_ID is not null and f.ISDELETE = '0') and (f.STATE = #{pd.STATE}) @@ -335,7 +341,6 @@ group by f.HOTWORKAPPLICATION_ID ORDER BY f.CREATTIME desc - From 9030986e982c2951c66c18989aaef5d731fe51c8 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 6 Jun 2024 11:12:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 17b3cfa2..1f530d15 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,11 +1,11 @@ datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 -datasource.no1.username=root -datasource.no1.password=Mysql@zcloud88888 +datasource.no1.username=dev +datasource.no1.password=Zykj@dev123456 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 -datasource.no2.username=root -datasource.no2.password=Mysql@zcloud88888 +datasource.no2.username=dev +datasource.no2.password=Zykj@dev123456 #druid??? From e314ab4850f2783e80ac25711fdeb1ea0592e8c2 Mon Sep 17 00:00:00 2001 From: water_xu Date: Tue, 18 Jun 2024 17:44:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index dd259ac5..3d92cbea 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -11,3 +11,4 @@ spring.profiles.active=master +