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

1、审批第二节点没有存审批意见bug修复 

2、修别字修改
3、流程页面样式修改
2024年2月1日V1.0.53
liujun 2024-01-30 15:21:00 +08:00
parent 7cdaacec8c
commit 7096647336
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java
View File

@ -99,6 +99,8 @@ public class XgfUserServiceImpl implements XgfUserService {
if (regDepartmentEntity.size() > 0) { if (regDepartmentEntity.size() > 0) {
x.put("MAIN_DEPARTMENT_NAME", regDepartmentEntity.get("NAME")); x.put("MAIN_DEPARTMENT_NAME", regDepartmentEntity.get("NAME"));
} }
entity = new PageData();
entity.putAll(x);
xgfUserMapper.save(x); xgfUserMapper.save(x);
xgfUserDetailsMapper.save(x); xgfUserDetailsMapper.save(x);
} else { } else {
@ -536,7 +538,7 @@ public class XgfUserServiceImpl implements XgfUserService {
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition); PageData entity = xgfUserMapper.findById(condition);
flows.put("APPOINT_ONE_CORP_ID", Jurisdiction.getUSER_ID()); flows.put("APPOINT_ONE_CORP_ID", Jurisdiction.getUSER_ID());
flows.put("APPOINT_ONE_CORP_NAME", entity.getString("CORP_NAME")); flows.put("APPOINT_ONE_CORP_NAME", corpEntity.getString("CORP_NAME"));
flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); flows.put("APPOINT_ONE_TIME", DateUtil.getTime());
flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); flows.put("APPOINT_ONE_STATUS", info.getString("STATUS"));
flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); flows.put("APPOINT_ONE_OPINION", info.getString("OPINION"));
@ -588,7 +590,7 @@ public class XgfUserServiceImpl implements XgfUserService {
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition); PageData entity = xgfUserMapper.findById(condition);
flows.put("APPOINT_TWO_CORP_ID", Jurisdiction.getCORPINFO_ID()); flows.put("APPOINT_TWO_CORP_ID", Jurisdiction.getCORPINFO_ID());
flows.put("APPOINT_TWO_CORP_NAME", entity.getString("CORP_NAME")); flows.put("APPOINT_TWO_CORP_NAME", corpEntity.getString("CORP_NAME"));
flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); flows.put("APPOINT_TWO_TIME", DateUtil.getTime());
flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); flows.put("APPOINT_TWO_STATUS", info.getString("STATUS"));
flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); flows.put("APPOINT_TWO_OPINION", info.getString("OPINION"));
@ -645,7 +647,7 @@ public class XgfUserServiceImpl implements XgfUserService {
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition); PageData entity = xgfUserMapper.findById(condition);
flows.put("APPOINT_THREE_CORP_ID", Jurisdiction.getCORPINFO_ID()); flows.put("APPOINT_THREE_CORP_ID", Jurisdiction.getCORPINFO_ID());
flows.put("APPOINT_THREE_CORP_NAME", entity.getString("CORP_NAME")); flows.put("APPOINT_THREE_CORP_NAME", corpEntity.getString("CORP_NAME"));
flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); flows.put("APPOINT_THREE_TIME", DateUtil.getTime());
flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); flows.put("APPOINT_THREE_STATUS", info.getString("STATUS"));
flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); flows.put("APPOINT_THREE_OPINION", info.getString("OPINION"));
@ -700,7 +702,7 @@ public class XgfUserServiceImpl implements XgfUserService {
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition); PageData entity = xgfUserMapper.findById(condition);
flows.put("APPOINT_FOUR_CORP_ID", Jurisdiction.getCORPINFO_ID()); flows.put("APPOINT_FOUR_CORP_ID", Jurisdiction.getCORPINFO_ID());
flows.put("APPOINT_FOUR_CORP_NAME", entity.getString("CORP_NAME")); flows.put("APPOINT_FOUR_CORP_NAME", corpEntity.getString("CORP_NAME"));
flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); flows.put("APPOINT_FOUR_TIME", DateUtil.getTime());
flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS"));
flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION"));

8
src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml
View File

@ -40,6 +40,8 @@
f.APPOINT_TWO_DEPARTMENT_NAME, f.APPOINT_TWO_DEPARTMENT_NAME,
f.APPOINT_TWO_USER_ID, f.APPOINT_TWO_USER_ID,
f.APPOINT_TWO_USER_NAME, f.APPOINT_TWO_USER_NAME,
f.APPOINT_TWO_STATUS,
f.APPOINT_TWO_OPINION,
f.APPOINT_TWO_TIME, f.APPOINT_TWO_TIME,
f.APPOINT_THREE_CORP_ID, f.APPOINT_THREE_CORP_ID,
f.APPOINT_THREE_CORP_NAME, f.APPOINT_THREE_CORP_NAME,
@ -123,6 +125,8 @@
APPOINT_TWO_DEPARTMENT_NAME, APPOINT_TWO_DEPARTMENT_NAME,
APPOINT_TWO_USER_ID, APPOINT_TWO_USER_ID,
APPOINT_TWO_USER_NAME, APPOINT_TWO_USER_NAME,
APPOINT_TWO_STATUS,
APPOINT_TWO_OPINION,
APPOINT_TWO_TIME, APPOINT_TWO_TIME,
APPOINT_THREE_CORP_ID, APPOINT_THREE_CORP_ID,
APPOINT_THREE_CORP_NAME, APPOINT_THREE_CORP_NAME,
@ -206,6 +210,8 @@
#{APPOINT_TWO_DEPARTMENT_NAME}, #{APPOINT_TWO_DEPARTMENT_NAME},
#{APPOINT_TWO_USER_ID}, #{APPOINT_TWO_USER_ID},
#{APPOINT_TWO_USER_NAME}, #{APPOINT_TWO_USER_NAME},
#{APPOINT_TWO_STATUS},
#{APPOINT_TWO_OPINION},
#{APPOINT_TWO_TIME}, #{APPOINT_TWO_TIME},
#{APPOINT_THREE_CORP_ID}, #{APPOINT_THREE_CORP_ID},
#{APPOINT_THREE_CORP_NAME}, #{APPOINT_THREE_CORP_NAME},
@ -301,6 +307,8 @@
APPOINT_TWO_DEPARTMENT_NAME = #{APPOINT_TWO_DEPARTMENT_NAME}, APPOINT_TWO_DEPARTMENT_NAME = #{APPOINT_TWO_DEPARTMENT_NAME},
APPOINT_TWO_USER_ID = #{APPOINT_TWO_USER_ID}, APPOINT_TWO_USER_ID = #{APPOINT_TWO_USER_ID},
APPOINT_TWO_USER_NAME = #{APPOINT_TWO_USER_NAME}, APPOINT_TWO_USER_NAME = #{APPOINT_TWO_USER_NAME},
APPOINT_TWO_STATUS = #{APPOINT_TWO_STATUS},
APPOINT_TWO_OPINION = #{APPOINT_TWO_OPINION},
APPOINT_TWO_TIME = #{APPOINT_TWO_TIME}, APPOINT_TWO_TIME = #{APPOINT_TWO_TIME},
APPOINT_THREE_CORP_ID = #{APPOINT_THREE_CORP_ID}, APPOINT_THREE_CORP_ID = #{APPOINT_THREE_CORP_ID},
APPOINT_THREE_CORP_NAME = #{APPOINT_THREE_CORP_NAME}, APPOINT_THREE_CORP_NAME = #{APPOINT_THREE_CORP_NAME},