yangjun
/
hldy_java_monomer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、pc-机构-解决审核历史列表页缺少数据问题 

2、pc-机构-机构审核-审核历史：新增“入驻”类型的详情查看功能，可查看当次申请的内容
3、pc-机构-机构审核-审核历史：新增“变更”类型的详情查看功能，内容为“当次变更信息”和“其上一次使用的信息”做对比
4、pc-机构-机构审核-各界面中审核意见改为审核状态
5、pc-机构-机构审核-调整详情页和审核历史中入驻详情页样式
6、pc-机构-机构审核-所有企业XX 改为机构XX
7、pc-机构-机构审核-去掉加盟审核界面中的工单回执相关内容
8、pc-机构-机构审核-pc-机构-机构审核-调整上传合同界面内容，操作按钮只保留关闭和提交
9、pc-机构-机构审核-列表页工单回执只保留待回执、已回执两种状态，其余节点展示为空
This commit is contained in:
1378012178@qq.com 2026-02-12 13:29:30 +08:00
parent 9f6db5430c
commit c81b9321e6
3 changed files with 78 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java
View File

@ -82,9 +82,9 @@ public class OrgApplyInfoController extends JeecgController<OrgApplyInfo, IOrgAp
@ApiOperation(value = "机构加盟申请审核-审核历史", notes = "机构加盟申请审核-审核历史")
@GetMapping(value = "/hisList")
public Result<IPage<OrgApplyInfo>> hisList(OrgApplyInfo orgApplyInfo,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
// 自定义查询规则
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
// 自定义多选的查询规则为：LIKE_WITH_OR
@ -96,6 +96,7 @@ public class OrgApplyInfoController extends JeecgController<OrgApplyInfo, IOrgAp
String value = orgApplyInfo.getTitle();
queryWrapper.and(c -> c.like("com_name", value).or().like("org_leader", value).or().like("org_leader_phone", value));
}
queryWrapper.in("status", "2,3".split(","));
IPage<OrgApplyInfo> pageList = orgApplyInfoService.page(page, queryWrapper);
return Result.OK(pageList);
}
@ -126,7 +127,7 @@ public class OrgApplyInfoController extends JeecgController<OrgApplyInfo, IOrgAp
@RequestMapping(value = "/applyAudit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> applyAudit(@RequestBody OrgAllInfoApiEntity dto) {
OrgApplyInfo orgApplyInfo = new OrgApplyInfo();
BeanUtils.copyProperties(dto,orgApplyInfo);
BeanUtils.copyProperties(dto, orgApplyInfo);
orgApplyInfoService.applyAudit(orgApplyInfo);
return Result.OK("审核完成!");
}
@ -142,7 +143,7 @@ public class OrgApplyInfoController extends JeecgController<OrgApplyInfo, IOrgAp
@RequestMapping(value = "/upInfoAudit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> upInfoAudit(@RequestBody OrgAllInfoApiEntity dto) {
OrgApplyInfo orgApplyInfo = new OrgApplyInfo();
BeanUtils.copyProperties(dto,orgApplyInfo);
BeanUtils.copyProperties(dto, orgApplyInfo);
orgApplyInfoService.upInfoAudit(orgApplyInfo);
return Result.OK("审核完成!");
}
@ -257,6 +258,12 @@ public class OrgApplyInfoController extends JeecgController<OrgApplyInfo, IOrgAp
return Result.OK(orgApplyInfoService.getModifyInfo(orgApplyInfo));
}
@ApiOperation(value = "机构信息变更申请-获取历史变更信息", notes = "机构信息变更申请-获取历史变更信息")
@PostMapping(value = "/getHisModifyInfo")
public Result<List<Map<String, Object>>> getHisModifyInfo(@RequestBody OrgApplyInfo orgApplyInfo) {
return Result.OK(orgApplyInfoService.getHisModifyInfo(orgApplyInfo));
}
/**
* 获取各机构详细信息
*

2
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/IOrgApplyInfoService.java
View File

@ -20,6 +20,8 @@ public interface IOrgApplyInfoService extends IService<OrgApplyInfo> {
List<Map<String, Object>> getModifyInfo(OrgApplyInfo orgApplyInfo);
List<Map<String, Object>> getHisModifyInfo(OrgApplyInfo orgApplyInfo);
void applyAudit(OrgApplyInfo orgApplyInfo);
void saveCg(OrgAllInfoApiEntity orgApplyInfo);

65
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java
View File

@ -80,7 +80,7 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
OrgApplyInfo orgApplyInfo = new OrgApplyInfo();
orgApplyInfo.setId(id);
//第一次入驻申请时用id作为pkid 否则入驻申请前端都会把旧的pkid传进来
if (StringUtils.isBlank(orgApplyInfo.getPkId())) {
if (StringUtils.isBlank(orgApplyInfoApiEntity.getPkId())) {
orgApplyInfo.setPkId(id);
} else {
orgApplyInfo.setPkId(orgApplyInfoApiEntity.getPkId());
@ -306,6 +306,69 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
return result;
}
@Override
public List<Map<String, Object>> getHisModifyInfo(OrgApplyInfo hisData) {
// 1. 修改后的数据
QueryWrapper<OrgApplyInfo> qw = new QueryWrapper<>();
qw.eq("pk_id", hisData.getPkId());
qw.eq("iz_history", "Y");
qw.eq("status", "2");
qw.lt("audit_time", hisData.getAuditTime());
qw.orderByDesc("update_time");
List<OrgApplyInfo> list = baseMapper.selectList(qw);
OrgApplyInfo beforeData = list.get(0);// 修改前使用的数据
// 2. 准备结果列表
List<Map<String, Object>> result = new ArrayList<>();
// 3. 获取所有字段
Field[] fields = OrgApplyInfo.class.getDeclaredFields();
// 4. 遍历每个字段进行比较
for (Field field : fields) {
try {
// 跳过序列化ID和不需要的字段
if (field.getName().equals("serialVersionUID") ||
field.isAnnotationPresent(TableField.class) &&
!field.getAnnotation(TableField.class).exist()) {
continue;
}
// 设置可访问以获取私有字段值
field.setAccessible(true);
// 创建结果map
Map<String, Object> fieldMap = new HashMap<>();
// 获取字段名和值
String fieldName = field.getName();
Object beforeValue = field.get(beforeData);
Object hisValue = field.get(hisData);
// 处理特殊类型的值
if (field.getType() == Date.class) {
beforeValue = beforeValue != null ? new SimpleDateFormat("yyyy-MM-dd").format((Date) beforeValue) : null;
hisValue = hisValue != null ? new SimpleDateFormat("yyyy-MM-dd").format((Date) hisValue) : null;
}
// 填充结果map
fieldMap.put("d1", fieldName); // 字段名
fieldMap.put("d2", beforeValue); // 修改前使用的值
fieldMap.put("d3", hisValue); // 当次历史值
fieldMap.put("d4", Objects.equals(hisValue, beforeValue) ? "相同" : "不同"); // 比较结果
result.add(fieldMap);
} catch (IllegalAccessException e) {
// 忽略无法访问的字段
continue;
}
}
return result;
}
@Override
public void applyAudit(OrgApplyInfo orgApplyInfo) {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();