动火申请提交后，只有申请人和下一步的操作人可以看到动火申请，流程中其他人员都看不到
WenShiJun
parent
7b4f85a08c
commit
6e4f31f205
|
|
@ -7,6 +7,7 @@ import org.springframework.boot.SpringApplication;
|
|||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
|
||||
import org.springframework.cache.annotation.EnableCaching;
|
||||
import org.springframework.context.annotation.ComponentScan;
|
||||
import org.springframework.context.annotation.Conditional;
|
||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
||||
|
||||
|
|
|
|||
|
|
@ -1659,6 +1659,7 @@ public class AppHotworkCfdController extends BaseController {
|
|||
map.put("measuresList", hotworkCfdService.listAllMeasures(condition));
|
||||
|
||||
pd = hotworkCfdService.findById(pd); //根据ID读取
|
||||
|
||||
// created by liu jun 添加（交底人、项目主管部门负责人、安全措施确认人）
|
||||
hotworkCfdService.addInfo(pd);
|
||||
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@ public class LoginController extends BaseController {
|
|||
PageData pathData = corpPathService.getCorpPathByCorpId(pd);
|
||||
map.put("baseImgPath",pathData.getString("PIC_PATH"));
|
||||
map.put("USER_IDENTITY",pathData.getString("USER_IDENTITY"));
|
||||
map.put("BACKENDADDR", pathData.getString("BACK_END_PATH"));
|
||||
map.put("BACKENDADDR", "http://192.168.0.49:8091/");
|
||||
} else {
|
||||
PageData pathData = corpPathService.getCorpPathByPersonInfo(pd);
|
||||
map.put("baseImgPath",pathData.getString("PIC_PATH"));
|
||||
|
|
|
|||
|
|
@ -85,5 +85,8 @@ public interface HotworkCfdMapper {
|
|||
PageData countCheck(PageData pd);
|
||||
|
||||
PageData getCode(PageData pd);
|
||||
|
||||
List<PageData> datalistPageHistory(Page page);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -311,10 +311,27 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
|
|||
*/
|
||||
public List<PageData> list(Page page) throws Exception {
|
||||
List<PageData> list = hotworkCfdMapper.datalistPage(page);
|
||||
// created by liu jun 2024/02/03 description: 拼接动火交底人、项目主管部门、安全项检查人
|
||||
String applyStatus = page.getPd().getString("APPLY_STATUS");
|
||||
|
||||
for (PageData dto : list) {
|
||||
|
||||
page.getPd().put("HOTWORK_ID", dto.getString("HOTWORK_ID"));
|
||||
|
||||
if ("1".equals(applyStatus) || "1.5".equals(applyStatus) || "2".equals(applyStatus)) {
|
||||
List<PageData> historyList = hotworkCfdMapper.datalistPageHistory(page);
|
||||
if (historyList != null && !historyList.isEmpty()) {
|
||||
for (PageData historyPd : historyList) {
|
||||
if (historyPd.getString("HOTWORK_ID").equals(dto.getString("HOTWORK_ID"))) {
|
||||
dto.put("historyPd", historyPd);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this.addInfo(dto);
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
public List<PageData> jhlist(Page page)throws Exception{
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
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???
|
||||
|
|
@ -62,19 +62,30 @@ spring.main.banner-mode=off
|
|||
#qa-regulatory-gwj.api.url=http://192.168.0.79:8008
|
||||
preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/
|
||||
qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/
|
||||
|
||||
baseimgpath =http://192.168.192.201:8991/file/
|
||||
|
||||
heBeiQinAnFile=https://file.zcloudchina.com/YTHFile
|
||||
|
||||
dw.url=http://192.168.192.201:8888/qa-dingWei-gwj/
|
||||
#?????
|
||||
smb.host=192.168.192.201
|
||||
#smb.host=192.168.192.201
|
||||
#smb.port=22
|
||||
#smb.user=root
|
||||
#smb.password=SJSKAQHBGLXT@20220311
|
||||
#smb.basePath=/mnt/qask/file/
|
||||
smb.host=39.101.130.96
|
||||
smb.port=22
|
||||
smb.user=root
|
||||
smb.password=SJSKAQHBGLXT@20220311
|
||||
smb.basePath=/mnt/qask/file/
|
||||
smb.password=Zcloud@zcloud88888
|
||||
smb.basePath=/mnt/wwag/file/
|
||||
|
||||
#Mq\u914D\u7F6E
|
||||
rocketmq.consumer.group2=edu-admin-edit
|
||||
rocketmq.consumer.group1=edu-admin-add
|
||||
#rocketmq.name-server=10.0.140.141:9876
|
||||
#rocketmq.name-server=192.168.0.70:9876
|
||||
rocketmq.name-server=192.168.151.57:9876
|
||||
rocketmq.name-server=39.100.115.58:8899
|
||||
rocketmq.producer.group=libmiddle
|
||||
rocketmq.producer.send-message-timeout=3000
|
||||
rocketmq.producer.compress-message-body-threshold=4096
|
||||
|
|
@ -88,6 +99,8 @@ mq.topic.info=info
|
|||
mq.topic.eightWork=eightWork
|
||||
mq.group.info=scheduled_tasks
|
||||
mq.group.eightWork=scheduled_tasks_eightWork
|
||||
mq.gwj.data.topic=czks_docking
|
||||
mq.gwj.file.topic=czks_dockingPicture
|
||||
|
||||
|
||||
corp.default.pic-path=https://qgqy.qhdsafety.com/
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
# ??????
|
||||
datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
datasource.no1.url=jdbc:mysql://192.168.192.202: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-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||
datasource.no1.username=root
|
||||
datasource.no1.password=gwjsjkzcloud888888
|
||||
datasource.no1.password=Mysql@zcloud88888
|
||||
datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
datasource.no2.url=jdbc:mysql://192.168.192.202: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-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||
datasource.no2.username=root
|
||||
datasource.no2.password=gwjsjkzcloud888888
|
||||
datasource.no2.password=Mysql@zcloud88888
|
||||
|
||||
#druid连接池
|
||||
spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@ spring.application.name=qa-prevention-gwj
|
|||
server.port=8091
|
||||
|
||||
#??
|
||||
#spring.profiles.active=local
|
||||
spring.profiles.active=local
|
||||
#<23><><EFBFBD><EFBFBD>31ʱʹ<CAB1><CAB9>
|
||||
#spring.profiles.active=dev
|
||||
#??
|
||||
spring.profiles.active=master
|
||||
#spring.profiles.active=master
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -490,7 +490,6 @@
|
|||
f.APPROVE_USER_SIGNER_PATH,
|
||||
f.APPROVE_USER_SIGNER_TIME,
|
||||
f.APPLY_STATUS,
|
||||
<!--(SELECT a.ANALYZE_TIME from bus_hotworkgas a where a.ISDELETE = '0'-->
|
||||
(SELECT a.ANALYZE_TIME from bus_hotworkgas_cfd a where a.ISDELETE = '0'
|
||||
AND a.HOTWORK_ID = #{HOTWORK_ID}
|
||||
ORDER BY
|
||||
|
|
@ -578,7 +577,12 @@
|
|||
aacu.NAME as ACCEPT_CONFESS_USER_NAME,
|
||||
|
||||
anad.NAME as ANALYZE_DEPARTMENT_NAME,
|
||||
anau.NAME as ANALYZE_USER_NAME
|
||||
anau.NAME as ANALYZE_USER_NAME,
|
||||
|
||||
bhe.USER_NAME as EXAMINE_USER_NAME,
|
||||
bhe.APPROVAL_OPINIONS as EXAMINE_APPROVAL_OPINIONS,
|
||||
bhe.CREATE_TIME as EXAMINE_APPROVAL_CREATE_TIME
|
||||
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID
|
||||
|
|
@ -614,6 +618,8 @@
|
|||
left join OA_DEPARTMENT anad on anad.DEPARTMENT_ID = f.ANALYZE_DEPARTMENT_ID
|
||||
left join SYS_USER anau on anau.USER_ID = f.ANALYZE_USER_ID
|
||||
|
||||
left join bus_hotwork_cfd_examine bhe on bhe.HOTWORK_ID = f.HOTWORK_ID and bhe.TYPE = 1
|
||||
|
||||
where
|
||||
f.HOTWORK_ID = #{HOTWORK_ID}
|
||||
</select>
|
||||
|
|
@ -780,9 +786,9 @@
|
|||
and bhac.ACCEPT_USER_ID = f.ACCEPT_USER_ID and bhac.CORPINFO_ID = f.CORPINFO_ID
|
||||
and bhac.ISDELETE = '0' and bhac.ACCEPT_USER_ID is not null and trim(bhac.ACCEPT_USER_ID) != ''
|
||||
where f.ISDELETE = '0'
|
||||
<if test="pd.APPLY_STATUS != null and pd.APPLY_STATUS != ''">
|
||||
and f.APPLY_STATUS = #{pd.APPLY_STATUS}
|
||||
</if>
|
||||
<!-- <if test="pd.APPLY_STATUS != null and pd.APPLY_STATUS != ''">-->
|
||||
<!-- and f.APPLY_STATUS = #{pd.APPLY_STATUS}-->
|
||||
<!-- </if>-->
|
||||
<if test="pd.IS_GAS != null and pd.IS_GAS != ''">
|
||||
and f.APPLY_STATUS in ('1','2','4','5','6','0.9','2.5','1.5')
|
||||
</if>
|
||||
|
|
@ -1725,4 +1731,23 @@
|
|||
and f.CREATTIME LIKE CONCAT(#{CREATDATE},'%')
|
||||
</select>
|
||||
|
||||
<select id="datalistPageHistory" resultType="com.zcloud.entity.PageData"
|
||||
parameterType="com.zcloud.entity.Page">
|
||||
select
|
||||
<include refid="Field"></include>
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
WHERE f.ISDELETE = '0'
|
||||
<if test="pd.CONFIRM_USER_ID != null">
|
||||
and f.CONFIRM_USER_ID = #{pd.CONFIRM_USER_ID}
|
||||
</if>
|
||||
<if test="pd.BELONGING_USER_ID != null">
|
||||
and f.CONFIRM_USER_ID = #{pd.BELONGING_USER_ID}
|
||||
</if>
|
||||
<if test="pd.LEADER_USER_ID != null">
|
||||
and f.CONFIRM_USER_ID = #{pd.LEADER_USER_ID}
|
||||
</if>
|
||||
and f.HOTWORK_ID = #{pd.HOTWORK_ID}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
|
|||
Loading…
Reference in New Issue