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

其他安全措施不显示bug修复

liujun-2024-05-23-接口漏洞修复
liujun 2024-04-09 16:05:37 +08:00
parent 0ca31180b3
commit 2208a7cef9
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java
View File

@ -895,7 +895,7 @@ public class AppHotworkCfdController extends BaseController {
pd2.put("CONFIRM_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONFIRM_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("CONFIRM_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("CONFIRM_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("CONFIRM_CONTENT", pd.get("CONTENT")); pd2.put("CONFIRM_CONTENT", pd.get("APPROVAL_CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
hotworkCfdService.edit(pd2); hotworkCfdService.edit(pd2);
log.put("ACTION", "作业单位通过"); log.put("ACTION", "作业单位通过");
@ -925,6 +925,7 @@ public class AppHotworkCfdController extends BaseController {
condition.put("APPROVAL_SIGNATURE",Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); condition.put("APPROVAL_SIGNATURE",Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
condition.put("APPROVAL_SIGNATURE_TIME",pd.get("SIGNER_TIME")); condition.put("APPROVAL_SIGNATURE_TIME",pd.get("SIGNER_TIME"));
condition.put("APPROVAL_STATUS",pd.getString("APPROVAL_STATUS")); condition.put("APPROVAL_STATUS",pd.getString("APPROVAL_STATUS"));
condition.put("APPROVAL_CONTENT",pd.getString("APPROVAL_CONTENT"));
hotworkCfdService.approval(condition); hotworkCfdService.approval(condition);
} }
break; break;

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

@ -154,6 +154,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
entity.put("APPROVAL_SIGNATURE", info.getString("APPROVAL_SIGNATURE")); entity.put("APPROVAL_SIGNATURE", info.getString("APPROVAL_SIGNATURE"));
entity.put("APPROVAL_SIGNATURE_TIME", info.getString("APPROVAL_SIGNATURE_TIME")); entity.put("APPROVAL_SIGNATURE_TIME", info.getString("APPROVAL_SIGNATURE_TIME"));
entity.put("APPROVAL_STATUS", info.getString("APPROVAL_STATUS")); entity.put("APPROVAL_STATUS", info.getString("APPROVAL_STATUS"));
entity.put("APPROVAL_CONTENT",info.getString("APPROVAL_CONTENT"));
busHotworkCfdExamineMapper.edit(entity); busHotworkCfdExamineMapper.edit(entity);
} }
@ -466,6 +467,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
pd.put("BELONGING_OPINIONS", belong.getString("APPROVAL_OPINIONS")); pd.put("BELONGING_OPINIONS", belong.getString("APPROVAL_OPINIONS"));
pd.put("BELONGING_SIGNATURE", belong.getString("APPROVAL_SIGNATURE")); pd.put("BELONGING_SIGNATURE", belong.getString("APPROVAL_SIGNATURE"));
pd.put("BELONGING_SIGNATURE_TIME", belong.getString("APPROVAL_SIGNATURE_TIME")); pd.put("BELONGING_SIGNATURE_TIME", belong.getString("APPROVAL_SIGNATURE_TIME"));
pd.put("BELONGING_USER_MEASURES", belong.getString("APPROVAL_CONTENT"));
// 安全项检查人 // 安全项检查人
PageData safety = approvalInfos.stream().filter(x -> "2".equals(x.getString("TYPE"))).findFirst().orElse(null); PageData safety = approvalInfos.stream().filter(x -> "2".equals(x.getString("TYPE"))).findFirst().orElse(null);
pd.put("SAFETY_USER_ID", safety.getString("USER_ID")); pd.put("SAFETY_USER_ID", safety.getString("USER_ID"));
@ -474,6 +476,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
pd.put("SAFETY_DEPARTMENT_NAME", safety.getString("DEPARTMENT_NAME")); pd.put("SAFETY_DEPARTMENT_NAME", safety.getString("DEPARTMENT_NAME"));
pd.put("SAFETY_SIGNATURE", safety.getString("APPROVAL_SIGNATURE")); pd.put("SAFETY_SIGNATURE", safety.getString("APPROVAL_SIGNATURE"));
pd.put("SAFETY_SIGNATURE_TIME", safety.getString("APPROVAL_SIGNATURE_TIME")); pd.put("SAFETY_SIGNATURE_TIME", safety.getString("APPROVAL_SIGNATURE_TIME"));
pd.put("SAFETY_USER_MEASURES",safety.getString("APPROVAL_CONTENT"));
} }
} }

12
src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml
View File

@ -25,7 +25,8 @@
f.APPROVAL_STATUS, f.APPROVAL_STATUS,
f.IS_DELETE, f.IS_DELETE,
f.CREATE_TIME, f.CREATE_TIME,
f.REMARK f.REMARK,
f.APPROVAL_CONTENT
</sql> </sql>
<sql id="Field2"> <sql id="Field2">
@ -47,7 +48,8 @@
APPROVAL_STATUS, APPROVAL_STATUS,
IS_DELETE, IS_DELETE,
CREATE_TIME, CREATE_TIME,
REMARK REMARK,
APPROVAL_CONTENT
</sql> </sql>
<sql id="FieldValue"> <sql id="FieldValue">
@ -69,7 +71,8 @@
#{APPROVAL_STATUS}, #{APPROVAL_STATUS},
#{IS_DELETE}, #{IS_DELETE},
#{CREATE_TIME}, #{CREATE_TIME},
#{REMARK} #{REMARK},
#{APPROVAL_CONTENT}
</sql> </sql>
<!-- 新增 --> <!-- 新增 -->
@ -103,7 +106,8 @@
APPROVAL_STATUS = #{APPROVAL_STATUS}, APPROVAL_STATUS = #{APPROVAL_STATUS},
IS_DELETE = #{IS_DELETE}, IS_DELETE = #{IS_DELETE},
CREATE_TIME = #{CREATE_TIME}, CREATE_TIME = #{CREATE_TIME},
REMARK = #{REMARK} REMARK = #{REMARK},
APPROVAL_CONTENT = #{APPROVAL_CONTENT}
where HOTWORK_EXAMINE_ID = #{HOTWORK_EXAMINE_ID} where HOTWORK_EXAMINE_ID = #{HOTWORK_EXAMINE_ID}
</update> </update>