From 95780d8da05d1c2f79e2ee3a2adeca2980168937 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Fri, 17 Oct 2025 13:54:02 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9C=BA=E6=9E=84=E5=8A=A0=E7=9B=9F?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=90=8E=E5=A2=9E=E5=8A=A0=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E5=8F=8A=E5=BE=AE=E4=BF=A1=E6=8F=90=E7=A4=BA=202?= =?UTF-8?q?=E3=80=81=E6=9C=BA=E6=9E=84=E4=BF=A1=E6=81=AF=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=90=8E=E5=A2=9E=E5=8A=A0=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E5=8F=8A=E5=BE=AE=E4=BF=A1=E6=8F=90=E7=A4=BA=203?= =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E6=9C=BA=E6=9E=84=E7=AB=AF=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=98=E6=9B=B4=E9=AA=8C=E8=AF=81=EF=BC=9A=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=97=A0=E5=8F=98=E6=9B=B4=EF=BC=8C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E2=80=9C=E5=BD=93=E5=89=8D=E6=97=A0=E5=8F=98=E6=9B=B4=EF=BC=8C?= =?UTF-8?q?=E6=97=A0=E9=9C=80=E6=8F=90=E4=BA=A4=E2=80=9D=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E5=81=9A=E5=90=8E=E7=BB=AD=E5=A4=84=E7=90=86=204?= =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E5=91=98=E5=B7=A5=E7=AB=AF=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=98=E6=9B=B4=E9=AA=8C=E8=AF=81=EF=BC=9A=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=97=A0=E5=8F=98=E6=9B=B4=EF=BC=8C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E2=80=9C=E5=BD=93=E5=89=8D=E6=97=A0=E5=8F=98=E6=9B=B4=EF=BC=8C?= =?UTF-8?q?=E6=97=A0=E9=9C=80=E6=8F=90=E4=BA=A4=E2=80=9D=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E5=81=9A=E5=90=8E=E7=BB=AD=E5=A4=84=E7=90=86=205?= =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E9=95=BF=E8=80=85=E7=AB=AF-?= =?UTF-8?q?=E9=95=BF=E8=80=85=E4=BF=A1=E6=81=AF=E5=8F=98=E6=9B=B4=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=EF=BC=9A=E5=A6=82=E6=9E=9C=E6=97=A0=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA=E2=80=9C=E5=BD=93=E5=89=8D=E6=97=A0?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=EF=BC=8C=E6=97=A0=E9=9C=80=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E2=80=9D=EF=BC=8C=E4=B8=8D=E5=86=8D=E5=81=9A=E5=90=8E=E7=BB=AD?= =?UTF-8?q?=E5=A4=84=E7=90=86=206=E3=80=81=E5=A2=9E=E5=8A=A0=E9=95=BF?= =?UTF-8?q?=E8=80=85=E7=AB=AF-=E7=9B=91=E6=8A=A4=E4=BA=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=98=E6=9B=B4=E9=AA=8C=E8=AF=81=EF=BC=9A=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=97=A0=E5=8F=98=E6=9B=B4=EF=BC=8C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E2=80=9C=E5=BD=93=E5=89=8D=E6=97=A0=E5=8F=98=E6=9B=B4=EF=BC=8C?= =?UTF-8?q?=E6=97=A0=E9=9C=80=E6=8F=90=E4=BA=A4=E2=80=9D=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E5=81=9A=E5=90=8E=E7=BB=AD=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/IEmployessAdvisioryInfoApi.java | 2 + .../orgapplyinfo/api/IOrgApplyInfoApi.java | 2 + .../NuEmployeesAdvisoryInfoServiceImpl.java | 50 +++++ .../service/impl/OrgApplyInfoServiceImpl.java | 179 ++++++++++++------ .../nu/modules/wechat/elder/api/ElderApi.java | 5 + .../employess/api/EmployessInfoApi.java | 5 + .../orgapplyinfo/api/OrgApplyInfoApi.java | 6 + .../nu/modules/elder/api/IElderInfoApi.java | 2 + .../service/impl/ElderInfoServiceImpl.java | 68 ++++++- 9 files changed, 258 insertions(+), 61 deletions(-) diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployessInfo/api/IEmployessAdvisioryInfoApi.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployessInfo/api/IEmployessAdvisioryInfoApi.java index e5f787a..5c002f7 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployessInfo/api/IEmployessAdvisioryInfoApi.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployessInfo/api/IEmployessAdvisioryInfoApi.java @@ -18,4 +18,6 @@ public interface IEmployessAdvisioryInfoApi { int updateByOpenId(EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity); JSONObject getEmployeeInfo(String tel); + + boolean validateChanged(EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity); } diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/api/IOrgApplyInfoApi.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/api/IOrgApplyInfoApi.java index be66a9f..dd8b72f 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/api/IOrgApplyInfoApi.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/api/IOrgApplyInfoApi.java @@ -17,4 +17,6 @@ public interface IOrgApplyInfoApi { IPage queryOrgAllInfo(Integer pageNo, Integer pageSize, String orgCode, String title); List getOrgByOpenId(String id, String status, String openId, String invited, String izHistory); + + boolean validateChanged(OrgApplyInfoApiEntity orgApplyInfoApiEntity); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java index 95ef6d4..0ea7af7 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java @@ -13,6 +13,7 @@ import com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo; import com.nu.modules.employees.mapper.NuEmployeesAdvisoryInfoMapper; import com.nu.modules.employees.service.IEmployeesOrgService; import com.nu.modules.employees.service.INuEmployeesAdvisoryInfoService; +import com.nu.modules.orgapplyinfo.entity.OrgApplyInfo; import com.nu.modules.weixin.utils.TemplateMessageSender; import com.nu.modules.weixin.utils.WechatMiniProgramUtils; import com.nu.utils.RabbitMQUtil; @@ -30,6 +31,7 @@ import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -209,4 +211,52 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); + qw.eq("id", employeesAdvisoryInfoEntity.getId()); + NuEmployeesAdvisoryInfo dbRecord = baseMapper.selectOne(qw); + + NuEmployeesAdvisoryInfo inputRecord = new NuEmployeesAdvisoryInfo(); + BeanUtils.copyProperties(employeesAdvisoryInfoEntity, inputRecord); + + // 显式对比需要校验变更的字段（排除你列出的字段） + return !( + Objects.equals(dbRecord.getTel(), inputRecord.getTel()) && + Objects.equals(dbRecord.getName(), inputRecord.getName()) && + Objects.equals(dbRecord.getSex(), inputRecord.getSex()) && + Objects.equals(dbRecord.getNational(), inputRecord.getNational()) && + Objects.equals(dbRecord.getBirthDate(), inputRecord.getBirthDate()) && + Objects.equals(dbRecord.getIdCardAddress(), inputRecord.getIdCardAddress()) && + Objects.equals(dbRecord.getIdCard(), inputRecord.getIdCard()) && + Objects.equals(dbRecord.getIssuingAuthority(), inputRecord.getIssuingAuthority()) && + Objects.equals(dbRecord.getStartTime(), inputRecord.getStartTime()) && + Objects.equals(dbRecord.getEndTime(), inputRecord.getEndTime()) && + Objects.equals(dbRecord.getCardZmPath(), inputRecord.getCardZmPath()) && + Objects.equals(dbRecord.getCardFmPath(), inputRecord.getCardFmPath()) && + Objects.equals(dbRecord.getMaritalStatus(), inputRecord.getMaritalStatus()) && + Objects.equals(dbRecord.getHeight(), inputRecord.getHeight()) && + Objects.equals(dbRecord.getWeight(), inputRecord.getWeight()) && + Objects.equals(dbRecord.getHealthStatus(), inputRecord.getHealthStatus()) && + Objects.equals(dbRecord.getPoliticalAppearance(), inputRecord.getPoliticalAppearance()) && + Objects.equals(dbRecord.getContactName(), inputRecord.getContactName()) && + Objects.equals(dbRecord.getContactTel(), inputRecord.getContactTel()) && + Objects.equals(dbRecord.getContactRelationship(), inputRecord.getContactRelationship()) && + Objects.equals(dbRecord.getHukouType(), inputRecord.getHukouType()) && + Objects.equals(dbRecord.getBankZmPath(), inputRecord.getBankZmPath()) && + Objects.equals(dbRecord.getBankFmPath(), inputRecord.getBankFmPath()) && + Objects.equals(dbRecord.getOpeningBank(), inputRecord.getOpeningBank()) && + Objects.equals(dbRecord.getBankCard(), inputRecord.getBankCard()) && + Objects.equals(dbRecord.getHealthZmPath(), inputRecord.getHealthZmPath()) && + Objects.equals(dbRecord.getHealthFmPath(), inputRecord.getHealthFmPath()) && + Objects.equals(dbRecord.getQualificationPath(), inputRecord.getQualificationPath()) && + Objects.equals(dbRecord.getNoCrimeCertificate(), inputRecord.getNoCrimeCertificate()) + ); + } + } 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 58df8e1..f5000db 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 @@ -8,7 +8,11 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.google.common.collect.Maps; import com.nu.dto.OrgApplyInfoMQDto; +import com.nu.entity.NuWxNoticeEntity; +import com.nu.entity.WxNoticeEntity; +import com.nu.enums.WxClientType; import com.nu.modules.orgapplyinfo.api.IOrgApplyInfoApi; import com.nu.modules.orgapplyinfo.entity.OrgAllInfo; import com.nu.modules.orgapplyinfo.entity.OrgAllInfoApiEntity; @@ -18,6 +22,7 @@ import com.nu.modules.orgapplyinfo.mapper.OrgApplyInfoMapper; import com.nu.modules.orgapplyinfo.service.IOrgApplyInfoService; import com.nu.modules.weixin.utils.TemplateMessageSender; import com.nu.modules.weixin.utils.WechatMiniProgramUtils; +import com.nu.modules.wxnotice.IWxNoticeApi; import com.nu.utils.DictUtils; import com.nu.utils.RabbitMQUtil; import org.apache.commons.lang.StringUtils; @@ -54,6 +59,8 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); @@ -225,6 +248,22 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl data = new HashMap<>(); - String content = comName + "审核结果"; - String auditStatus = ""; - if (StringUtils.equals("1", type)) { - auditStatus = "审核通过"; - } else if (StringUtils.equals("2", type)) { - auditStatus = "审核驳回"; - } -// data.put("thing5", content); // 对应模板中的字段 -// data.put("phrase6", auditStatus); -// data.put("date2", DateUtils.now()); - data.put("thing2", content); // 对应模板中的字段 - data.put("phrase1", auditStatus); - data.put("date3", DateUtils.now()); - - // 3. 发送模板消息 - String resInfo = TemplateMessageSender.sendTemplateMessage(accessToken, openId, templateId, page, data); - if (com.alibaba.cloud.commons.lang.StringUtils.equals(resInfo, "error")) { - baseCommonService.addLog("机构加盟审核，发送通知失败-发送消息异常56 " + resInfo, CommonConstant.LOG_TYPE_2, 1); - return Result.error("发送消息异常"); - } - JSONObject jsonObject = new JSONObject(resInfo); - boolean success = jsonObject.getInt("errcode") == 0; - if (success) { -// OrgApplyInfo orgApplyInfo = new OrgApplyInfo(); -// orgApplyInfo.setId(id); -// orgApplyInfo.setBuildStatus("6"); -// baseMapper.updateById(orgApplyInfo); - - System.out.println("模板消息发送成功"); - baseCommonService.addLog("机构加盟审核，发送通知成功 ", CommonConstant.LOG_TYPE_2, 1); - return Result.ok("发送消息成功"); - } else { - baseCommonService.addLog("机构加盟审核，发送通知失败-发送消息异常68 " + resInfo, CommonConstant.LOG_TYPE_2, 1); - System.out.println("模板消息发送失败"); - return Result.error("发送消息异常"); - } - } catch (Exception e) { - e.printStackTrace(); - return Result.error("发送消息异常"); - } - } @Override public void submitContract(OrgApplyInfo orgApplyInfo) { @@ -379,4 +391,53 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl result = BeanUtil.copyToList(records, OrgAllInfoApiEntity.class); return result; } + + /** + * 验证是否有变化 + * + * @param orgApplyInfoApiEntity + * @return + */ + @Override + public boolean validateChanged(OrgApplyInfoApiEntity orgApplyInfoApiEntity) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("pk_id", orgApplyInfoApiEntity.getPkId()); + qw.eq("status", "2"); + OrgApplyInfo dbRecord = baseMapper.selectOne(qw); + + OrgApplyInfo inputRecord = new OrgApplyInfo(); + BeanUtils.copyProperties(orgApplyInfoApiEntity, inputRecord); + + // 显式对比需要校验变更的字段（排除你列出的字段） + return !( + Objects.equals(dbRecord.getTel(), inputRecord.getTel()) && + Objects.equals(dbRecord.getName(), inputRecord.getName()) && + Objects.equals(dbRecord.getSex(), inputRecord.getSex()) && + Objects.equals(dbRecord.getNational(), inputRecord.getNational()) && + Objects.equals(dbRecord.getBirthDate(), inputRecord.getBirthDate()) && + Objects.equals(dbRecord.getIdCardAddress(), inputRecord.getIdCardAddress()) && + Objects.equals(dbRecord.getIdCard(), inputRecord.getIdCard()) && + Objects.equals(dbRecord.getIssuingAuthority(), inputRecord.getIssuingAuthority()) && + Objects.equals(dbRecord.getStartTime(), inputRecord.getStartTime()) && + Objects.equals(dbRecord.getEndTime(), inputRecord.getEndTime()) && + Objects.equals(dbRecord.getCardZmPath(), inputRecord.getCardZmPath()) && + Objects.equals(dbRecord.getCardFmPath(), inputRecord.getCardFmPath()) && + Objects.equals(dbRecord.getComBusinessLicense(), inputRecord.getComBusinessLicense()) && + Objects.equals(dbRecord.getComName(), inputRecord.getComName()) && + Objects.equals(dbRecord.getComRegisterAddress(), inputRecord.getComRegisterAddress()) && + Objects.equals(dbRecord.getComCreditCode(), inputRecord.getComCreditCode()) && + Objects.equals(dbRecord.getComLegalPerson(), inputRecord.getComLegalPerson()) && + Objects.equals(dbRecord.getOrgAddress(), inputRecord.getOrgAddress()) && + Objects.equals(dbRecord.getOrgCoordinateLo(), inputRecord.getOrgCoordinateLo()) && + Objects.equals(dbRecord.getOrgCoordinateLa(), inputRecord.getOrgCoordinateLa()) && + Objects.equals(dbRecord.getOrgLeader(), inputRecord.getOrgLeader()) && + Objects.equals(dbRecord.getOrgLeaderPhone(), inputRecord.getOrgLeaderPhone()) && + Objects.equals(dbRecord.getOrgBuildingNumber(), inputRecord.getOrgBuildingNumber()) && + Objects.equals(dbRecord.getOrgPropertyType(), inputRecord.getOrgPropertyType()) && + Objects.equals(dbRecord.getOrgBuildingArea(), inputRecord.getOrgBuildingArea()) && + Objects.equals(dbRecord.getOrgProvince(), inputRecord.getOrgProvince()) && + Objects.equals(dbRecord.getOrgCity(), inputRecord.getOrgCity()) && + Objects.equals(dbRecord.getOrgDistrict(), inputRecord.getOrgDistrict()) + ); + } } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java index a25e1bf..d8a8099 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java @@ -342,6 +342,11 @@ public class ElderApi { */ @PostMapping("/updateElderInfo") public Result updateElderInfo(@RequestParam("ukey") String ukey, @RequestBody ElderInfoEntity elderInfoEntity) { + if (StringUtils.isNotBlank(elderInfoEntity.getId())) { + if (!elderInfoApi.validateChanged(elderInfoEntity.getOrgCode(), elderInfoEntity)) { + return Result.ok("未做变更"); + } + } if (NuRedisUtils.existKey(ukey)) { return Result.ok("重复提交"); } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/employess/api/EmployessInfoApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/employess/api/EmployessInfoApi.java index c6bd6d9..1963a25 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/employess/api/EmployessInfoApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/employess/api/EmployessInfoApi.java @@ -29,6 +29,11 @@ public class EmployessInfoApi { @AutoLog(value = "员工咨询信息-新增或修改") @PostMapping("/saveApiEmployess") public Result saveApiEmployess(@RequestParam("ukey") String ukey, @RequestBody EmployeesAdvisoryInfoEntity EmployeesAdvisoryInfoEntity) { + if (StringUtils.isNotBlank(EmployeesAdvisoryInfoEntity.getId())) { + if(!employessAdvisioryInfoApi.validateChanged(EmployeesAdvisoryInfoEntity)){ + return Result.ok("未做变更"); + } + } if(NuRedisUtils.existKey(ukey)){ return Result.ok("重复提交"); } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java index 3b71f87..e70d299 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java @@ -32,6 +32,12 @@ public class OrgApplyInfoApi { @AutoLog(value = "新增/编辑机构加盟申请信息") @PostMapping("/save") public Result save(@RequestParam("ukey") String ukey,@RequestBody OrgApplyInfoApiEntity orgApplyInfoApiEntity) { + //变更信息时 验证是否有变化 没有变化不允许提交 + if ("4".equals(orgApplyInfoApiEntity.getStatus())) { + if(!orgApplyInfoApi.validateChanged(orgApplyInfoApiEntity)){ + return Result.ok("未做变更"); + } + } if(NuRedisUtils.existKey(ukey)){ return Result.ok("重复提交"); } diff --git a/nursing-unit-elder/nu-elder-api/nu-elder-local-api/src/main/java/com/nu/modules/elder/api/IElderInfoApi.java b/nursing-unit-elder/nu-elder-api/nu-elder-local-api/src/main/java/com/nu/modules/elder/api/IElderInfoApi.java index 97688b2..6c1cb4c 100644 --- a/nursing-unit-elder/nu-elder-api/nu-elder-local-api/src/main/java/com/nu/modules/elder/api/IElderInfoApi.java +++ b/nursing-unit-elder/nu-elder-api/nu-elder-local-api/src/main/java/com/nu/modules/elder/api/IElderInfoApi.java @@ -11,4 +11,6 @@ public interface IElderInfoApi { List queryElders(String openId, String elderId); void addElder(ElderInfoEntity elderInfoEn); + + boolean validateChanged(String orgCode, ElderInfoEntity elderInfoEntity); } diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java index adca7a5..356f38f 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java @@ -1,21 +1,25 @@ package com.nu.modules.elderinfo.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.dto.ElderInfoMQDto; import com.nu.entity.ElderInfoEntity; +import com.nu.entity.EmployeesAdvisoryInfoEntity; import com.nu.modules.baseinfo.api.INuBaseInfoApi; import com.nu.modules.elder.api.IElderInfoApi; import com.nu.modules.elderinfo.entity.ElderInfo; import com.nu.modules.elderinfo.mapper.ElderInfoMapper; import com.nu.modules.elderinfo.service.IElderInfoService; +import com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** * @Description: 长者信息 @@ -40,8 +44,8 @@ public class ElderInfoServiceImpl extends ServiceImpl queryElders(String openId, String elderId) { QueryWrapper qw = new QueryWrapper<>(); qw.eq("guardian_open_id", openId); - if(StringUtils.isNotBlank(elderId)){ - qw.eq("id",elderId); + if (StringUtils.isNotBlank(elderId)) { + qw.eq("id", elderId); } List elderInfos = baseMapper.selectList(qw); return BeanUtil.copyToList(elderInfos, ElderInfoEntity.class); @@ -62,4 +66,64 @@ public class ElderInfoServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); + qw.eq("id", elderInfoEntity.getId()); + ElderInfo dbRecord = baseMapper.selectOne(qw); + + ElderInfo inputRecord = new ElderInfo(); + BeanUtils.copyProperties(elderInfoEntity, inputRecord); + + // 显式对比需要校验变更的字段（排除你列出的字段） + if ("zz".equals(elderInfoEntity.getModifyType())) { + return !( + Objects.equals(dbRecord.getName(), inputRecord.getName()) && + Objects.equals(dbRecord.getSex(), inputRecord.getSex()) && + Objects.equals(dbRecord.getAge(), inputRecord.getAge()) && + Objects.equals(dbRecord.getIdCard(), inputRecord.getIdCard()) && + Objects.equals(dbRecord.getDateOfBirth(), inputRecord.getDateOfBirth()) && + Objects.equals(dbRecord.getNational(), inputRecord.getNational()) && + Objects.equals(dbRecord.getHouseAddress(), inputRecord.getHouseAddress()) && + Objects.equals(dbRecord.getMedicalCard(), inputRecord.getMedicalCard()) && + Objects.equals(dbRecord.getEducationLevel(), inputRecord.getEducationLevel()) && + Objects.equals(dbRecord.getMaritalStatus(), inputRecord.getMaritalStatus()) && + Objects.equals(dbRecord.getReligiousBeliefs(), inputRecord.getReligiousBeliefs()) && + Objects.equals(dbRecord.getIdCardPositive(), inputRecord.getIdCardPositive()) && + Objects.equals(dbRecord.getIdCardNegative(), inputRecord.getIdCardNegative()) && + Objects.equals(dbRecord.getAccountBookHimself(), inputRecord.getAccountBookHimself()) && + Objects.equals(dbRecord.getFrontMedical(), inputRecord.getFrontMedical()) && + Objects.equals(dbRecord.getNegaticeMedical(), inputRecord.getNegaticeMedical()) && + Objects.equals(dbRecord.getHomeAddress(), inputRecord.getHomeAddress()) && + Objects.equals(dbRecord.getIssuingAuthority(), inputRecord.getIssuingAuthority()) && + Objects.equals(dbRecord.getStartTime(), inputRecord.getStartTime()) && + Objects.equals(dbRecord.getEndTime(), inputRecord.getEndTime()) && + Objects.equals(dbRecord.getCardIssuing(), inputRecord.getCardIssuing()) && + Objects.equals(dbRecord.getBloodType(), inputRecord.getBloodType()) && + Objects.equals(dbRecord.getMilitaryType(), inputRecord.getMilitaryType()) + ); + } else { + return !( + Objects.equals(dbRecord.getGuardianName(), inputRecord.getGuardianName()) && + Objects.equals(dbRecord.getRelationship(), inputRecord.getRelationship()) && + Objects.equals(dbRecord.getGuardianIdCard(), inputRecord.getGuardianIdCard()) && + Objects.equals(dbRecord.getGuardianPhone(), inputRecord.getGuardianPhone()) && + Objects.equals(dbRecord.getGuardianDateOfBirth(), inputRecord.getGuardianDateOfBirth()) && + Objects.equals(dbRecord.getGuardianHomeAddress(), inputRecord.getGuardianHomeAddress()) && + Objects.equals(dbRecord.getGuardianWorkUnit(), inputRecord.getGuardianWorkUnit()) + ); + } +// if("jhr".equals(elderInfoEntity.getModifyType())){ +// } + + } }