一公司app显示修改
parent
e129c80e5d
commit
c2a4f2a475
|
@ -895,7 +895,8 @@ 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("APPROVAL_CONTENT"));
|
pd2.put("CONFIRM_CONTENT", pd.get("CONTENT"));
|
||||||
|
pd2.put("CONFIRM_OTHER_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", "作业单位通过");
|
||||||
|
|
|
@ -88,7 +88,8 @@
|
||||||
f.ACCEPT_CONFESS_USER_ID,
|
f.ACCEPT_CONFESS_USER_ID,
|
||||||
f.ACCEPT_CONFESS_USER_SIGNER_PATH,
|
f.ACCEPT_CONFESS_USER_SIGNER_PATH,
|
||||||
f.ACCEPT_CONFESS_USER_SIGNER_TIME,
|
f.ACCEPT_CONFESS_USER_SIGNER_TIME,
|
||||||
f.ANALYZE_TIME
|
f.ANALYZE_TIME,
|
||||||
|
f.CONFIRM_OTHER_CONTENT
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<!-- 字段用于新增 -->
|
<!-- 字段用于新增 -->
|
||||||
|
@ -167,7 +168,8 @@
|
||||||
ACCEPT_CONFESS_USER_ID,
|
ACCEPT_CONFESS_USER_ID,
|
||||||
ACCEPT_CONFESS_USER_SIGNER_PATH,
|
ACCEPT_CONFESS_USER_SIGNER_PATH,
|
||||||
ACCEPT_CONFESS_USER_SIGNER_TIME,
|
ACCEPT_CONFESS_USER_SIGNER_TIME,
|
||||||
ANALYZE_TIME
|
ANALYZE_TIME,
|
||||||
|
CONFIRM_OTHER_CONTENT
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<!-- 字段值 -->
|
<!-- 字段值 -->
|
||||||
|
@ -246,7 +248,8 @@
|
||||||
#{ACCEPT_CONFESS_USER_ID},
|
#{ACCEPT_CONFESS_USER_ID},
|
||||||
#{ACCEPT_CONFESS_USER_SIGNER_PATH},
|
#{ACCEPT_CONFESS_USER_SIGNER_PATH},
|
||||||
#{ACCEPT_CONFESS_USER_SIGNER_TIME},
|
#{ACCEPT_CONFESS_USER_SIGNER_TIME},
|
||||||
#{ANALYZE_TIME}
|
#{ANALYZE_TIME},
|
||||||
|
#{CONFIRM_OTHER_CONTENT}
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<!-- 新增-->
|
<!-- 新增-->
|
||||||
|
@ -355,6 +358,7 @@
|
||||||
ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID},
|
ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID},
|
||||||
ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH},
|
ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH},
|
||||||
ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME},
|
ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME},
|
||||||
|
CONFIRM_OTHER_CONTENT = #{CONFIRM_OTHER_CONTENT},
|
||||||
HOTWORK_ID = HOTWORK_ID
|
HOTWORK_ID = HOTWORK_ID
|
||||||
where
|
where
|
||||||
HOTWORK_ID = #{HOTWORK_ID}
|
HOTWORK_ID = #{HOTWORK_ID}
|
||||||
|
@ -542,6 +546,7 @@
|
||||||
f.ACCEPT_CONFESS_USER_SIGNER_PATH,
|
f.ACCEPT_CONFESS_USER_SIGNER_PATH,
|
||||||
f.ACCEPT_CONFESS_USER_SIGNER_TIME,
|
f.ACCEPT_CONFESS_USER_SIGNER_TIME,
|
||||||
f.HOTWORK_ID,
|
f.HOTWORK_ID,
|
||||||
|
f.CONFIRM_OTHER_CONTENT,
|
||||||
ad.NAME as APPLY_DEPARTMENT_NAME,
|
ad.NAME as APPLY_DEPARTMENT_NAME,
|
||||||
au.NAME as APPLY_USER_NAME,
|
au.NAME as APPLY_USER_NAME,
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue