src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java

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

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=dev
+datasource.no1.username=root
-datasource.no1.password=Zykj@dev123456
+datasource.no1.password=Mysql@zcloud88888
 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=dev
+datasource.no2.username=root
-datasource.no2.password=Zykj@dev123456
+datasource.no2.password=Mysql@zcloud88888
 
 
 #druid???

src/main/resources/application.properties

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

src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml

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