guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'dev' into pet

liujun0703-新项目开发
guoyuepeng 2024-07-02 16:59:15 +08:00
parent c8a22f8189 064b6bdc33
commit 15f1a8240d
4 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java
View File

@ -416,7 +416,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
condition.put("TYPE", "1"); condition.put("TYPE", "1");
// 项目主管部门需处理数 // 项目主管部门需处理数
List<PageData> _belongingList = busHotworkCfdExamineMapper.findByCondition(condition); List<PageData> _belongingList = busHotworkCfdExamineMapper.findByCondition(condition);
List belongList = new ArrayList(); List<PageData> belongList = new ArrayList<>();
for (PageData x : _belongingList) { for (PageData x : _belongingList) {
PageData condition1 = new PageData(); PageData condition1 = new PageData();
condition1.put("HOTWORK_ID", x.get("HOTWORK_ID")); condition1.put("HOTWORK_ID", x.get("HOTWORK_ID"));

8
src/main/resources/application-dev.properties
View File

@ -1,11 +1,11 @@
datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver 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.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.username=dev
datasource.no1.password=Mysql@zcloud88888 datasource.no1.password=Zykj@dev123456
datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver 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.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.username=dev
datasource.no2.password=Mysql@zcloud88888 datasource.no2.password=Zykj@dev123456
#druid??? #druid???

1
src/main/resources/application.properties
View File

@ -11,3 +11,4 @@ spring.profiles.active=local

35
src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml
View File

@ -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 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}) )
</when> </when>
<when test='pd.roleLevel == "2"'> <when test='pd.roleLevel == "2"'>
<if test="pd.STATE != null and pd.STATE != ''">
<choose>
<when test='pd.STATE == "10"'>
and f.HOTWORKAPPLICATION_ID in (select hu.FOREIGN_KEY from bus_hotworkapplicationuser hu where hu.USER_ID = uu.DEPARTMENT_ID
</when>
<otherwise>
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 = #{pd.loginUserId}
</otherwise>
</choose>
</if>
<if test="pd.STATE != null and pd.STATE != ''"> <if test="pd.STATE != null and pd.STATE != ''">
<choose> <choose>
@ -253,7 +262,16 @@
</choose> </choose>
</if> </if>
<if test="pd.myApprove != null and pd.myApprove != ''"><!-- 应该由我审批的数据 --> <if test="pd.myApprove != null and pd.myApprove != ''"><!-- 应该由我审批的数据 -->
and f.HOTWORKAPPLICATION_ID in (select hu.FOREIGN_KEY from bus_hotworkapplicationuser hu where hu.USER_ID = #{pd.myApprove} <if test="pd.STATE != null and pd.STATE != ''">
<choose>
<when test='pd.STATE == "10"'>
and f.HOTWORKAPPLICATION_ID in (select hu.FOREIGN_KEY from bus_hotworkapplicationuser hu where hu.USER_ID = uu.DEPARTMENT_ID
</when>
<otherwise>
and f.HOTWORKAPPLICATION_ID in (select hu.FOREIGN_KEY from bus_hotworkapplicationuser hu where hu.USER_ID = #{pd.loginUserId}
</otherwise>
</choose>
</if>
<if test="pd.STATE != null and pd.STATE != ''"> <if test="pd.STATE != null and pd.STATE != ''">
<choose> <choose>
@ -279,18 +297,6 @@
and (u.NAME LIKE CONCAT(CONCAT('%', #{pd.applicantName}),'%')) and (u.NAME LIKE CONCAT(CONCAT('%', #{pd.applicantName}),'%'))
</if> </if>
<if test="pd.keyState != null and pd.keyState != ''"> <if test="pd.keyState != null and pd.keyState != ''">
<!-- <if test='pd.keyState == "1"'>-->
<!-- and f.STATE = '11'-->
<!-- </if>-->
<!-- <if test='pd.keyState == "2"'>-->
<!-- and f.STATE = '12'-->
<!-- </if>-->
<!-- <if test='pd.keyState == "3"'>-->
<!-- and f.STATE = '2'-->
<!-- </if>-->
<!-- <if test='pd.keyState == "4"'>-->
<!-- and f.STATE = '-2'-->
<!-- </if>-->
and f.STATE = #{pd.keyState} and f.STATE = #{pd.keyState}
</if> </if>
<if test="pd.keyApplyUserName != null and pd.keyApplyUserName != ''"><!-- 申请人 --> <if test="pd.keyApplyUserName != null and pd.keyApplyUserName != ''"><!-- 申请人 -->
@ -326,7 +332,7 @@
</when> </when>
<when test='pd.STATE == "10"'> <when test='pd.STATE == "10"'>
and (f.STATE != '11') 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')
</when> </when>
<otherwise> <otherwise>
and (f.STATE = #{pd.STATE}) and (f.STATE = #{pd.STATE})
@ -335,7 +341,6 @@
</if> </if>
group by f.HOTWORKAPPLICATION_ID group by f.HOTWORKAPPLICATION_ID
ORDER BY f.CREATTIME desc ORDER BY f.CREATTIME desc
<!-- ORDER BY f.OPERATTIME desc -->
</select> </select>
<!-- 列表 --> <!-- 列表 -->