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

相关方流程变更

pull/12/head
liujun 2024-01-18 13:56:15 +08:00
parent 6193cf4c03
commit 1cf1adefd9
7 changed files with 108 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zcloud/controller/xgf/TrainingBatchController.java
View File

@ -117,7 +117,6 @@ public class TrainingBatchController extends BaseController {
* @throws Exception
*/
@RequestMapping(value = "/userList")
@RequiresPermissions("trainingbatch:list")
@ResponseBody
public Object userList(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();

29
src/main/java/com/zcloud/controller/xgf/XgfUserController.java
View File

@ -29,7 +29,6 @@ public class XgfUserController extends BaseController {
@Resource
private TrainingBatchService trainingBatchService;
@RequestMapping(value = "/list")
@ResponseBody
public Object list(Page page) throws Exception {
@ -43,6 +42,9 @@ public class XgfUserController extends BaseController {
return response;
}
/**
* 人员信息审核
*/
@RequestMapping(value = "/approve")
@ResponseBody
public Object approve() throws Exception {
@ -95,4 +97,29 @@ public class XgfUserController extends BaseController {
response.put("data", request);
return response;
}
@RequestMapping(value = "/getAppointApproveList")
@ResponseBody
public Object getAppointApproveList(Page page) throws Exception{
PageData request = this.getPageData();
page.setPd(request);
PageData response = new PageData();
response.put("result", "success");
response.put("list", xgfUserService.getAppointApproveList(page));
response.put("page", page);
return response;
}
/**
* 人员指定审核
*/
@RequestMapping(value = "/appointApprove")
@ResponseBody
public Object appointApprove() throws Exception{
PageData request = this.getPageData();
PageData response = new PageData();
response.put("result", "success");
response.put("data", request);
return response;
}
}

2
src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java
View File

@ -70,4 +70,6 @@ public interface XgfUserMapper {
PageData getInfoById(PageData condition);
List<PageData> findRecordList(PageData condition);
List<PageData> appointlistPage(Page page);
}

2
src/main/java/com/zcloud/service/xgf/XgfUserService.java
View File

@ -24,4 +24,6 @@ public interface XgfUserService {
PageData findInfo(PageData condition);
List<PageData> findRecordList(PageData condition) throws Exception;
List<PageData> getAppointApproveList(Page page);
}

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

@ -70,6 +70,7 @@ public class XgfUserServiceImpl implements XgfUserService {
x.put("XGF_USER_NAME", x.get("NAME"));
x.put("VALID_FLAG", "1");
x.put("STATUS", "1");
x.put("CHECK_STATUS","0");
x.put("CREATED_TIME", DateUtil.getTime());
x.put("OPERATOR_TIME", DateUtil.getTime());
x.put("IS_DELETE", "0");
@ -116,6 +117,7 @@ public class XgfUserServiceImpl implements XgfUserService {
x.put("IS_DELETE", "0");
x.put("VALID_FLAG", "1");
x.put("STATUS", "1");
x.put("CHECK_STATUS","0");
if ("2".equals(x.getString("STUDY_STATUS"))) {
x.put("STUDY_STATUS", "2");
} else {
@ -221,18 +223,23 @@ public class XgfUserServiceImpl implements XgfUserService {
if (entity == null || entity.size() == 0) {
throw new RuntimeException("未找到该用户");
}
// 通过则指定监管部门人员进行审核，不同过则打回相关方端(将CHECK_STATUS改为1)
if ("1".equals(request.getString("STATUS"))) {
entity.put("STATUS", "2");
entity.put("STATUS", "1");
entity.put("VALID_FLAG", "1");
// 企业端人员审核完成后，指定企业端监管部门，中的某人进行培训
entity.put("CHECK_STATUS","1");
condition.clear();
condition.put("XFG_USER_DETAILS_ID", x);
PageData userInfo = xgfUserDetailsMapper.findById(condition);
if (userInfo == null || userInfo.size() == 0) {
throw new RuntimeException("未找到该用户详细信息");
}
// 企业端人员审核完成后，指定企业端监管部门，中的某人进行审核
userInfo.put("APPOINT_DEPARTMENT_ID", request.getString("APPOINT_DEPARTMENT_ID"));
userInfo.put("APPOINT_DEPARTMENT_NAME", request.getString("APPOINT_DEPARTMENT_NAME"));
userInfo.put("APPOINT_USER_ID", request.getString("APPOINT_USER_ID"));
userInfo.put("APPOINT_USER_NAME", request.getString("APPOINT_USER_NAME"));
xgfUserDetailsMapper.edit(userInfo);
} else {
entity.put("STATUS", "0");
PageData key = new PageData();
@ -287,4 +294,15 @@ public class XgfUserServiceImpl implements XgfUserService {
public List<PageData> findRecordList(PageData condition) throws Exception {
return xgfUserMapper.findRecordList(condition);
}
@Override
public List<PageData> getAppointApproveList(Page page) {
List<PageData> list = xgfUserMapper.appointlistPage(page);
for (PageData x : list) {
if (StringUtils.isNotBlank(x.getString("APPOINT_USER_ID"))) {
// TODO 判断当前人是否有权限审批
}
}
return list;
}
}

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

@ -66,10 +66,14 @@
f.zzName,
f.APPOINT_DEPARTMENT_ID,
f.APPOINT_DEPARTMENT_NAME,
f.APPOINT_USER_ID,
f.APPOINT_USER_NAME,
f.APPOINT_ONE_CORP_ID,
f.APPOINT_ONE_CORP_NAME,
f.APPOINT_ONE_DEPARTMENT_ID,
f.APPOINT_ONE_DEPARTMENT_NAME
f.APPOINT_ONE_DEPARTMENT_NAME,
f.APPOINT_ONE_USER_ID,
f.APPOINT_ONE_USER_NAME
</sql>
@ -132,10 +136,14 @@
zzName,
APPOINT_DEPARTMENT_ID,
APPOINT_DEPARTMENT_NAME,
APPOINT_USER_ID,
APPOINT_USER_NAME,
APPOINT_ONE_CORP_ID,
APPOINT_ONE_CORP_NAME,
APPOINT_ONE_DEPARTMENT_ID,
APPOINT_ONE_DEPARTMENT_NAME
APPOINT_ONE_DEPARTMENT_NAME,
APPOINT_ONE_USER_ID,
APPOINT_ONE_USER_NAME
</sql>
<!-- 字段值 -->
@ -197,10 +205,14 @@
#{zzName},
#{APPOINT_DEPARTMENT_ID},
#{APPOINT_DEPARTMENT_NAME},
#{APPOINT_USER_ID},
#{APPOINT_USER_NAME},
#{APPOINT_ONE_CORP_ID},
#{APPOINT_ONE_CORP_NAME},
#{APPOINT_ONE_DEPARTMENT_ID},
#{APPOINT_ONE_DEPARTMENT_NAME}
#{APPOINT_ONE_DEPARTMENT_NAME},
#{APPOINT_ONE_USER_ID},
#{APPOINT_ONE_USER_NAME}
</sql>
<!-- 新增-->
@ -286,10 +298,14 @@
zzName = #{zzName},
APPOINT_DEPARTMENT_ID = #{APPOINT_DEPARTMENT_ID},
APPOINT_DEPARTMENT_NAME = #{APPOINT_DEPARTMENT_NAME},
APPOINT_USER_ID = #{APPOINT_USER_ID},
APPOINT_USER_NAME = #{APPOINT_USER_NAME},
APPOINT_ONE_CORP_ID = #{APPOINT_ONE_CORP_ID},
APPOINT_ONE_CORP_NAME = #{APPOINT_ONE_CORP_NAME},
APPOINT_ONE_DEPARTMENT_ID = #{APPOINT_ONE_DEPARTMENT_ID},
APPOINT_ONE_DEPARTMENT_NAME = #{APPOINT_ONE_DEPARTMENT_NAME}
APPOINT_ONE_DEPARTMENT_NAME = #{APPOINT_ONE_DEPARTMENT_NAME},
APPOINT_ONE_USER_ID = #{APPOINT_ONE_USER_ID},
APPOINT_ONE_USER_NAME = #{APPOINT_ONE_USER_NAME}
where
XGF_USER_DETAILS_ID = #{XGF_USER_DETAILS_ID}
</update>

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

@ -21,7 +21,8 @@
f.STATUS,
f.OPERATOR_TIME,
f.ISFLOW,
f.STUDY_STATUS
f.STUDY_STATUS,
f.CHECK_STATUS
</sql>
<!-- 字段用于新增 -->
@ -38,7 +39,8 @@
STATUS,
OPERATOR_TIME,
ISFLOW,
STUDY_STATUS
STUDY_STATUS,
CHECK_STATUS
</sql>
<!-- 字段值 -->
@ -55,7 +57,8 @@
#{STATUS},
#{OPERATOR_TIME},
#{ISFLOW},
#{STUDY_STATUS}
#{STUDY_STATUS},
#{CHECK_STATUS}
</sql>
<!-- 新增-->
@ -95,7 +98,8 @@
STATUS = #{STATUS},
OPERATOR_TIME = #{OPERATOR_TIME},
ISFLOW = #{ISFLOW},
STUDY_STATUS = #{STUDY_STATUS}
STUDY_STATUS = #{STUDY_STATUS},
CHECK_STATUS = #{CHECK_STATUS}
where
XGF_USER_ID = #{XGF_USER_ID}
</update>
@ -229,6 +233,9 @@
<if test="pd.VALID_FLAG != null and pd.VALID_FLAG != ''">
and a.VALID_FLAG = #{pd.VALID_FLAG}
</if>
<if test="pd.CHECK_STATUS != null and pd.CHECK_STATUS != ''">
and a.CHECK_STATUS = #{pd.CHECK_STATUS}
</if>
</select>
<select id="getInfoById" resultType="com.zcloud.entity.PageData">
select a.XGF_USER_ID,
@ -308,5 +315,30 @@
where rf.USER_ID = #{USER_ID} and rf.ISDELETE = '0'
order by rf.CREATE_TIME desc
</select>
<select id="appointlistPage" 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,
b.MANAGER_DEPARTMENT_NAME,
b.MAIN_DEPARTMENT_ID,
b.MAIN_DEPARTMENT_NAME
from
xgf_user a
left join xgf_user_details b on a.XGF_USER_ID = b.XGF_USER_ID
where a.IS_DELETE = '0'
and (a.APPOINT_USER_ID = #{pd.USER_ID} or a.APPOINT_ONE_USER_ID is #{pd.USER_ID})
<if test="pd.STATUS != null and pd.STATUS != ''">
and a.STATUS = #{pd.STATUS}
</if>
<if test="pd.VALID_FLAG != null and pd.VALID_FLAG != ''">
and a.VALID_FLAG = #{pd.VALID_FLAG}
</if>
<if test="pd.CHECK_STATUS != null and pd.CHECK_STATUS != ''">
and a.CHECK_STATUS = #{pd.CHECK_STATUS}
</if>
</select>
</mapper>