From 8446811b6fa2fcdf7acef66caf6b9ef04a72ab8b Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Thu, 14 Dec 2023 17:23:42 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=90=9C=E7=B4=A2bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/bus/ShiftWorkRulesMapper.xml | 109 +++++++++--------- 1 file changed, 55 insertions(+), 54 deletions(-) diff --git a/src/main/resources/mybatis/datasource/bus/ShiftWorkRulesMapper.xml b/src/main/resources/mybatis/datasource/bus/ShiftWorkRulesMapper.xml index 282cf422..37acd5f1 100644 --- a/src/main/resources/mybatis/datasource/bus/ShiftWorkRulesMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/ShiftWorkRulesMapper.xml @@ -1,65 +1,65 @@ - + BUS_SHIFTWORKRULES - + SYS_DICTIONARIES - + - f.NAME, - f.CORPINFO_ID, - f.CREATOR, - f.CREATTIME, - f.OPERATOR, - f.OPERATTIME, - f.ISDELETE, + f.NAME, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE, f.PARENTID, f.LEVEL, f.ISCUSTOM, f.SHIFTWORKRULES_ID - + - NAME, - CORPINFO_ID, - CREATOR, - CREATTIME, - OPERATOR, - OPERATTIME, - ISDELETE, + NAME, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE, PARENTID, LEVEL, ISCUSTOM, SHIFTWORKRULES_ID - + - #{NAME}, - #{CORPINFO_ID}, - #{CREATOR}, - #{CREATTIME}, - #{OPERATOR}, - #{OPERATTIME}, - #{ISDELETE}, + #{NAME}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE}, #{PARENTID}, #{LEVEL}, #{ISCUSTOM}, #{SHIFTWORKRULES_ID} - + - insert into + insert into ( @@ -67,7 +67,7 @@ ) - + update @@ -76,10 +76,10 @@ ISDELETE = '1', OPERATOR = #{OPERATOR}, OPERATTIME = #{OPERATTIME} - where + where SHIFTWORKRULES_ID = #{SHIFTWORKRULES_ID} - + update @@ -88,15 +88,15 @@ ISDELETE = '1', OPERATOR = #{OPERATOR}, OPERATTIME = #{OPERATTIME} - where + where PARENTID = #{PARENTID} - + update - set + set NAME = #{NAME}, @@ -109,56 +109,57 @@ OPERATTIME = #{OPERATTIME}, - + SHIFTWORKRULES_ID = SHIFTWORKRULES_ID - where + where SHIFTWORKRULES_ID = #{SHIFTWORKRULES_ID} - + - + - + - + update set ISDELETE = '1' - where + where SHIFTWORKRULES_ID in #{item} - + + + update + + set + APPLY_STATUS = #{APPLY_STATUS} + where + CONFINEDSPACE_ID = #{CONFINEDSPACE_ID} + + + + update + bus_confinedspace f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_blindboard f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_electricity f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_hoisting f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_breakground f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_cutroad f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_highwork f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_hotwork f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + diff --git a/src/main/resources/mybatis/datasource/highriskwork/ElectricityMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/ElectricityMapper.xml index 103e3b32..861d74b7 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/ElectricityMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/ElectricityMapper.xml @@ -675,4 +675,102 @@ WHERE f.CORPINFO_ID = #{CORPINFO_ID} and f.CREATTIME LIKE CONCAT(#{CREATDATE},'%') + + + update + + set + APPLY_STATUS = '-99' + where + ELECTRICITY_ID = #{ELECTRICITY_ID} + + + + update + bus_confinedspace f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_blindboard f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_electricity f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_hoisting f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_breakground f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_cutroad f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_highwork f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_hotwork f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + From 519c0be3e75075a1616bdab5a71ff1346fb6dcb9 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Thu, 21 Dec 2023 17:46:03 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java | 4 ++-- .../com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java index 991d6f6e..08dea783 100644 --- a/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java +++ b/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java @@ -83,8 +83,8 @@ public class GFBlindBoardServiceImpl implements GFBlindBoardService { public PageData findById(PageData pd)throws Exception{ PageData pageData = GFblindboardMapper.findById(pd); //调用接口 获取用户信息 - String workUser = corpFgsService.getXgfUserName(pageData.getString("WORK_USER")); - pageData.put("WORK_USER",workUser); + //String workUser = corpFgsService.getXgfUserName(pageData.getString("WORK_USER")); + //pageData.put("WORK_USER",workUser); return pageData; } diff --git a/src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java index 5a86ee6b..aa3a24c2 100644 --- a/src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java +++ b/src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java @@ -82,8 +82,8 @@ public class GFHighWorkServiceImpl implements GFHighWorkService { public PageData findById(PageData pd)throws Exception{ PageData pageData = GFhighworkMapper.findById(pd); //调用接口 获取用户信息 - String workUser = corpFgsService.getXgfUserName(pageData.getString("PROJECT_MANAGER")); - pageData.put("PROJECT_MANAGER",workUser); + //String workUser = corpFgsService.getXgfUserName(pageData.getString("PROJECT_MANAGER")); + //pageData.put("PROJECT_MANAGER",workUser); return pageData; }