From c81b9321e6a0236a2d5f5c6148668369d13ed9e1 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Thu, 12 Feb 2026 13:29:30 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81pc-=E6=9C=BA=E6=9E=84-=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E5=AE=A1=E6=A0=B8=E5=8E=86=E5=8F=B2=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E7=BC=BA=E5=B0=91=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= =?UTF-8?q?=202=E3=80=81pc-=E6=9C=BA=E6=9E=84-=E6=9C=BA=E6=9E=84=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8-=E5=AE=A1=E6=A0=B8=E5=8E=86=E5=8F=B2=EF=BC=9A?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E2=80=9C=E5=85=A5=E9=A9=BB=E2=80=9D=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=9A=84=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E5=8F=AF=E6=9F=A5=E7=9C=8B=E5=BD=93=E6=AC=A1?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=9A=84=E5=86=85=E5=AE=B9=203=E3=80=81pc-?= =?UTF-8?q?=E6=9C=BA=E6=9E=84-=E6=9C=BA=E6=9E=84=E5=AE=A1=E6=A0=B8-?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=8E=86=E5=8F=B2=EF=BC=9A=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E2=80=9C=E5=8F=98=E6=9B=B4=E2=80=9D=E7=B1=BB=E5=9E=8B=E7=9A=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=B8=BA=E2=80=9C=E5=BD=93=E6=AC=A1=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E4=BF=A1=E6=81=AF=E2=80=9D=E5=92=8C=E2=80=9C=E5=85=B6?= =?UTF-8?q?=E4=B8=8A=E4=B8=80=E6=AC=A1=E4=BD=BF=E7=94=A8=E7=9A=84=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E2=80=9D=E5=81=9A=E5=AF=B9=E6=AF=94=204=E3=80=81pc-?= =?UTF-8?q?=E6=9C=BA=E6=9E=84-=E6=9C=BA=E6=9E=84=E5=AE=A1=E6=A0=B8-?= =?UTF-8?q?=E5=90=84=E7=95=8C=E9=9D=A2=E4=B8=AD=E5=AE=A1=E6=A0=B8=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E6=94=B9=E4=B8=BA=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=205=E3=80=81pc-=E6=9C=BA=E6=9E=84-=E6=9C=BA=E6=9E=84=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8-=E8=B0=83=E6=95=B4=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E5=92=8C=E5=AE=A1=E6=A0=B8=E5=8E=86=E5=8F=B2=E4=B8=AD=E5=85=A5?= =?UTF-8?q?=E9=A9=BB=E8=AF=A6=E6=83=85=E9=A1=B5=E6=A0=B7=E5=BC=8F=206?= =?UTF-8?q?=E3=80=81pc-=E6=9C=BA=E6=9E=84-=E6=9C=BA=E6=9E=84=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8-=E6=89=80=E6=9C=89=E4=BC=81=E4=B8=9AXX=20=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=9C=BA=E6=9E=84XX=207=E3=80=81pc-=E6=9C=BA=E6=9E=84?= =?UTF-8?q?-=E6=9C=BA=E6=9E=84=E5=AE=A1=E6=A0=B8-=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=8A=A0=E7=9B=9F=E5=AE=A1=E6=A0=B8=E7=95=8C=E9=9D=A2=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=B7=A5=E5=8D=95=E5=9B=9E=E6=89=A7=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=86=85=E5=AE=B9=208=E3=80=81pc-=E6=9C=BA=E6=9E=84-=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E5=AE=A1=E6=A0=B8-pc-=E6=9C=BA=E6=9E=84-=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E5=AE=A1=E6=A0=B8-=E8=B0=83=E6=95=B4=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=90=88=E5=90=8C=E7=95=8C=E9=9D=A2=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=8C=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=E5=8F=AA=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E5=85=B3=E9=97=AD=E5=92=8C=E6=8F=90=E4=BA=A4=209?= =?UTF-8?q?=E3=80=81pc-=E6=9C=BA=E6=9E=84-=E6=9C=BA=E6=9E=84=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8-=E5=88=97=E8=A1=A8=E9=A1=B5=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=9B=9E=E6=89=A7=E5=8F=AA=E4=BF=9D=E7=95=99=E5=BE=85=E5=9B=9E?= =?UTF-8?q?=E6=89=A7=E3=80=81=E5=B7=B2=E5=9B=9E=E6=89=A7=E4=B8=A4=E7=A7=8D?= =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=8C=E5=85=B6=E4=BD=99=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OrgApplyInfoController.java | 17 +++-- .../service/IOrgApplyInfoService.java | 2 + .../service/impl/OrgApplyInfoServiceImpl.java | 65 ++++++++++++++++++- 3 files changed, 78 insertions(+), 6 deletions(-) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java index fdad108..2671158 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java @@ -82,9 +82,9 @@ public class OrgApplyInfoController extends JeecgController> 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 customeRuleMap = new HashMap<>(); // 自定义多选的查询规则为：LIKE_WITH_OR @@ -96,6 +96,7 @@ public class OrgApplyInfoController extends JeecgController c.like("com_name", value).or().like("org_leader", value).or().like("org_leader_phone", value)); } + queryWrapper.in("status", "2,3".split(",")); IPage pageList = orgApplyInfoService.page(page, queryWrapper); return Result.OK(pageList); } @@ -126,7 +127,7 @@ public class OrgApplyInfoController extends JeecgController 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 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>> getHisModifyInfo(@RequestBody OrgApplyInfo orgApplyInfo) { + return Result.OK(orgApplyInfoService.getHisModifyInfo(orgApplyInfo)); + } + /** * 获取各机构详细信息 * diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/IOrgApplyInfoService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/IOrgApplyInfoService.java index 346497f..8460244 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/IOrgApplyInfoService.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/IOrgApplyInfoService.java @@ -20,6 +20,8 @@ public interface IOrgApplyInfoService extends IService { List> getModifyInfo(OrgApplyInfo orgApplyInfo); + List> getHisModifyInfo(OrgApplyInfo orgApplyInfo); + void applyAudit(OrgApplyInfo orgApplyInfo); void saveCg(OrgAllInfoApiEntity orgApplyInfo); diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java index 7026383..dcf310c 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java @@ -80,7 +80,7 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl> getHisModifyInfo(OrgApplyInfo hisData) { + // 1. 修改后的数据 + QueryWrapper 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 list = baseMapper.selectList(qw); + OrgApplyInfo beforeData = list.get(0);// 修改前使用的数据 + + + // 2. 准备结果列表 + List> 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 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();