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

查看bug修复

pull/5/head
liujun 2023-12-22 15:49:12 +08:00
parent cd048126c0
commit 5d46fa3c4d
3 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,11 +68,21 @@ public class XgfUserServiceImpl implements XgfUserService {
x.put("OPERATOR_TIME", DateUtil.getTime()); x.put("OPERATOR_TIME", DateUtil.getTime());
x.put("IS_DELETE", "0"); x.put("IS_DELETE", "0");
x.put("CREATE_TIME", DateUtil.getTime()); x.put("CREATE_TIME", DateUtil.getTime());
/* 监管部门 */
condition.clear(); condition.clear();
condition.put("DEPARTMENT_ID",x.get("MANAGER_DEPARTMENT_ID")); condition.put("DEPARTMENT_ID", x.get("MANAGER_DEPARTMENT_ID"));
PageData regDepartmentEntity = departmentService.getCorpDepartment(condition); PageData regDepartmentEntity = departmentService.getCorpDepartment(condition);
if (regDepartmentEntity != null && regDepartmentEntity.size() > 0) { if (regDepartmentEntity != null && regDepartmentEntity.size() > 0) {
x.put("MANAGER_DEPARTMENT_NAME",regDepartmentEntity.get("NAME")); x.put("MANAGER_DEPARTMENT_NAME", regDepartmentEntity.get("NAME"));
}
/* 主管部门 */
condition.clear();
condition.put("DEPARTMENT_ID", x.get("MAIN_DEPARTMENT_ID"));
regDepartmentEntity = departmentService.getCorpDepartment(condition);
x.put("MAIN_DEPARTMENT_NAME", regDepartmentEntity.get("NAME"));
if (regDepartmentEntity.size() > 0) {
x.put("MAIN_DEPARTMENT_NAME", regDepartmentEntity.get("NAME"));
} }
xgfUserMapper.save(x); xgfUserMapper.save(x);
xgfUserDetailsMapper.save(x); xgfUserDetailsMapper.save(x);
@ -82,13 +92,23 @@ public class XgfUserServiceImpl implements XgfUserService {
x.put("IS_DELETE", "0"); x.put("IS_DELETE", "0");
x.put("CREATE_TIME", DateUtil.getTime()); x.put("CREATE_TIME", DateUtil.getTime());
x.put("OPERATOR_TIME", DateUtil.getTime()); x.put("OPERATOR_TIME", DateUtil.getTime());
/* 监管部门 */
condition.clear(); condition.clear();
condition.put("DEPARTMENT_ID",x.get("MANAGER_DEPARTMENT_ID")); condition.put("DEPARTMENT_ID", x.get("MANAGER_DEPARTMENT_ID"));
PageData regDepartmentEntity = departmentService.getCorpDepartment(condition); PageData regDepartmentEntity = departmentService.getCorpDepartment(condition);
if (regDepartmentEntity != null && regDepartmentEntity.size() > 0) { if (regDepartmentEntity != null && regDepartmentEntity.size() > 0) {
x.put("MANAGER_DEPARTMENT_NAME",regDepartmentEntity.get("NAME")); x.put("MANAGER_DEPARTMENT_NAME", regDepartmentEntity.get("NAME"));
} }
x.put("ISDELETE", "0"); /* 主管部门 */
condition.clear();
condition.put("DEPARTMENT_ID", x.get("MAIN_DEPARTMENT_ID"));
regDepartmentEntity = departmentService.getCorpDepartment(condition);
x.put("MAIN_DEPARTMENT_NAME", regDepartmentEntity.get("NAME"));
if (regDepartmentEntity.size() > 0) {
x.put("MAIN_DEPARTMENT_NAME", regDepartmentEntity.get("NAME"));
}
x.put("IS_DELETE", "0");
x.put("VALID_FLAG", "1"); x.put("VALID_FLAG", "1");
x.put("STATUS", "2"); x.put("STATUS", "2");
xgfUserMapper.edit(x); xgfUserMapper.edit(x);

17
src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml
View File

@ -52,6 +52,11 @@
f.IS_SPECIAL_JOB, f.IS_SPECIAL_JOB,
f.CORPINFO_ID, f.CORPINFO_ID,
f.MANAGER_DEPARTMENT_ID, f.MANAGER_DEPARTMENT_ID,
f.MANAGER_DEPARTMENT_NAME,
f.COMPETENT_DEPARTMENT_ID,
f.COMPETENT_DEPARTMENT_NAME,
f.MAIN_DEPARTMENT_ID,
f.MAIN_DEPARTMENT_NAME,
f.CARD_ID, f.CARD_ID,
f.DEPARTMENT_ID, f.DEPARTMENT_ID,
f.DEPARTMENT_NAME, f.DEPARTMENT_NAME,
@ -107,6 +112,10 @@
CORPINFO_ID, CORPINFO_ID,
MANAGER_DEPARTMENT_ID, MANAGER_DEPARTMENT_ID,
MANAGER_DEPARTMENT_NAME, MANAGER_DEPARTMENT_NAME,
COMPETENT_DEPARTMENT_ID,
COMPETENT_DEPARTMENT_NAME,
MAIN_DEPARTMENT_ID,
MAIN_DEPARTMENT_NAME,
CARD_ID, CARD_ID,
DEPARTMENT_ID, DEPARTMENT_ID,
DEPARTMENT_NAME, DEPARTMENT_NAME,
@ -162,6 +171,10 @@
#{CORPINFO_ID}, #{CORPINFO_ID},
#{MANAGER_DEPARTMENT_ID}, #{MANAGER_DEPARTMENT_ID},
#{MANAGER_DEPARTMENT_NAME}, #{MANAGER_DEPARTMENT_NAME},
#{COMPETENT_DEPARTMENT_ID},
#{COMPETENT_DEPARTMENT_NAME},
#{MAIN_DEPARTMENT_ID},
#{MAIN_DEPARTMENT_NAME},
#{CARD_ID}, #{CARD_ID},
#{DEPARTMENT_ID}, #{DEPARTMENT_ID},
#{DEPARTMENT_NAME}, #{DEPARTMENT_NAME},
@ -241,6 +254,10 @@
CORPINFO_ID = #{CORPINFO_ID}, CORPINFO_ID = #{CORPINFO_ID},
MANAGER_DEPARTMENT_ID = #{MANAGER_DEPARTMENT_ID}, MANAGER_DEPARTMENT_ID = #{MANAGER_DEPARTMENT_ID},
MANAGER_DEPARTMENT_NAME = #{MANAGER_DEPARTMENT_NAME}, MANAGER_DEPARTMENT_NAME = #{MANAGER_DEPARTMENT_NAME},
COMPETENT_DEPARTMENT_ID = #{COMPETENT_DEPARTMENT_ID},
COMPETENT_DEPARTMENT_NAME = #{COMPETENT_DEPARTMENT_NAME},
MAIN_DEPARTMENT_ID = #{MAIN_DEPARTMENT_ID},
MAIN_DEPARTMENT_NAME = #{MAIN_DEPARTMENT_NAME},
CARD_ID = #{CARD_ID}, CARD_ID = #{CARD_ID},
DEPARTMENT_ID = #{DEPARTMENT_ID}, DEPARTMENT_ID = #{DEPARTMENT_ID},
DEPARTMENT_NAME = #{DEPARTMENT_NAME}, DEPARTMENT_NAME = #{DEPARTMENT_NAME},

11
src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml
View File

@ -198,7 +198,16 @@
</foreach> </foreach>
</select> </select>
<select id="flowlistPage" resultType="com.zcloud.entity.PageData"> <select id="flowlistPage" resultType="com.zcloud.entity.PageData">
select a.XGF_USER_ID,a.BELONG_TO_CORP,a.BELONG_TO_CORP_NAME,a.USERNAME,a.NAME,b.MANAGER_DEPARTMENT_ID from select a.XGF_USER_ID,
a.BELONG_TO_CORP,
a.BELONG_TO_CORP_NAME,
a.USERNAME,
a.NAME,
b.MANAGER_DEPARTMENT_ID,
b.MANAGER_DEPARTMENT_NAME,
b.MAIN_DEPARTMENT_ID,
b.MAIN_DEPARTMENT_NAME
from
xgf_user a xgf_user a
left join xgf_user_details b on a.XGF_USER_ID = b.XGF_USER_ID left join xgf_user_details b on a.XGF_USER_ID = b.XGF_USER_ID
where 1=1 where 1=1