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

1、机构加盟审批后增加小程序及微信提示 

2、机构信息变更审核后增加小程序及微信提示
3、增加机构端信息变更验证：如果无变更，提示“当前无变更，无需提交”，不再做后续处理
4、增加员工端信息变更验证：如果无变更，提示“当前无变更，无需提交”，不再做后续处理
5、增加长者端-长者信息变更验证：如果无变更，提示“当前无变更，无需提交”，不再做后续处理
6、增加长者端-监护人信息变更验证：如果无变更，提示“当前无变更，无需提交”，不再做后续处理
This commit is contained in:
1378012178@qq.com 2025-10-17 13:54:02 +08:00
parent a068975b98
commit 95780d8da0
9 changed files with 258 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployessInfo/api/IEmployessAdvisioryInfoApi.java
View File

@ -18,4 +18,6 @@ public interface IEmployessAdvisioryInfoApi {
int updateByOpenId(EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity);
JSONObject getEmployeeInfo(String tel);
boolean validateChanged(EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity);
}

2
nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/api/IOrgApplyInfoApi.java
View File

@ -17,4 +17,6 @@ public interface IOrgApplyInfoApi {
IPage<OrgAllInfoApiEntity> queryOrgAllInfo(Integer pageNo, Integer pageSize, String orgCode, String title);
List<OrgAllInfoApiEntity> getOrgByOpenId(String id, String status, String openId, String invited, String izHistory);
boolean validateChanged(OrgApplyInfoApiEntity orgApplyInfoApiEntity);
}

50
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java
View File

@ -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<NuEmployeesA
return resultData;
}
/**
* 验证是否有变化
* @param employeesAdvisoryInfoEntity
* @return
*/
@Override
public boolean validateChanged(EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity) {
QueryWrapper<NuEmployeesAdvisoryInfo> 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())
);
}
}

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

@ -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<OrgApplyInfoMapper, Org
@Autowired
private BaseCommonService baseCommonService;
@Autowired
private IWxNoticeApi wxNoticeApi;
@Override
public OrgApplyInfoApiEntity insert(OrgApplyInfoApiEntity orgApplyInfoApiEntity) {
@ -212,6 +219,22 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
OrgApplyInfo upData_ = new OrgApplyInfo();
upData_.setModifyStatus("0");
baseMapper.update(upData_, qw);
//发送小程序、微信通知
NuWxNoticeEntity nuWxNotice = new NuWxNoticeEntity();
nuWxNotice.setOpenId(orgApplyInfo.getOpenId());
nuWxNotice.setIzRead("1");
nuWxNotice.setOrgCode(null);
nuWxNotice.setTitle("机构信息变更审核");
nuWxNotice.setContent("您好，您提交的" + orgApplyInfo.getComName() + "机构信息变更申请已通过");
nuWxNotice.setType("org_apply_audit_list");
nuWxNotice.setClientType(WxClientType.INSTITUTION.getCode());
wxNoticeApi.addNotice(nuWxNotice);
WxNoticeEntity wxNotice = new WxNoticeEntity();
wxNotice.setPageRoute("pages/index/index");
wxNotice.setThing1("机构信息变更审核");
wxNotice.setThing4("审核通过");
wxNotice.setLogMainInfo("机构信息变更审核");
wxNoticeApi.sendWechartMessage_SHENHE(wxNotice, nuWxNotice);
} else if ("modifyFail".equals(orgApplyInfo.getStatus())) {
//将同pkid的可修改状态改为可修改
QueryWrapper<OrgApplyInfo> qw = new QueryWrapper<>();
@ -225,6 +248,22 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
orgApplyInfo.setStatus("5");
baseMapper.updateById(orgApplyInfo);
//发送小程序、微信通知
NuWxNoticeEntity nuWxNotice = new NuWxNoticeEntity();
nuWxNotice.setOpenId(orgApplyInfo.getOpenId());
nuWxNotice.setIzRead("1");
nuWxNotice.setOrgCode(null);
nuWxNotice.setTitle("机构信息变更审核");
nuWxNotice.setContent("您好，您提交的" + orgApplyInfo.getComName() + "机构信息变更申请未通过");
nuWxNotice.setType("org_apply_audit_list");
nuWxNotice.setClientType(WxClientType.INSTITUTION.getCode());
wxNoticeApi.addNotice(nuWxNotice);
WxNoticeEntity wxNotice = new WxNoticeEntity();
wxNotice.setPageRoute("pages/index/index");
wxNotice.setThing1("机构信息变更审核");
wxNotice.setThing4("审核未通过");
wxNotice.setLogMainInfo("机构信息变更审核");
wxNoticeApi.sendWechartMessage_SHENHE(wxNotice, nuWxNotice);
} else {
//buildStatus == ‘approvalPass’时代表加盟审批通过
if ("approvalPass".equals(orgApplyInfo.getBuildStatus())) {
@ -237,9 +276,22 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
//将机构的构建状态置为“加盟合同”
orgApplyInfo.setBuildStatus("3");
//推送机构信息变更申请消息（小程序）
sendOrgAuthInfo(orgApplyInfo.getOpenId(), orgApplyInfo.getId(), "1", orgApplyInfo.getComName());
//发送小程序、微信通知
NuWxNoticeEntity nuWxNotice = new NuWxNoticeEntity();
nuWxNotice.setOpenId(orgApplyInfo.getOpenId());
nuWxNotice.setIzRead("1");
nuWxNotice.setOrgCode(null);
nuWxNotice.setTitle("机构加盟审核");
nuWxNotice.setContent("您好，您提交的" + orgApplyInfo.getComName() + "机构加盟申请已通过");
nuWxNotice.setType("org_apply_audit_list");
nuWxNotice.setClientType(WxClientType.INSTITUTION.getCode());
wxNoticeApi.addNotice(nuWxNotice);
WxNoticeEntity wxNotice = new WxNoticeEntity();
wxNotice.setPageRoute("pages/index/index");
wxNotice.setThing1("机构加盟审核");
wxNotice.setThing4("审核通过");
wxNotice.setLogMainInfo("机构加盟审核");
wxNoticeApi.sendWechartMessage_SHENHE(wxNotice, nuWxNotice);
}
//审批完成后的平台搭建流程（合同上传并提交状态）
if ("contractSubmit".equals(orgApplyInfo.getBuildStatus())) {
@ -249,8 +301,22 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
}
//审核驳回
if (StringUtils.equals("3", orgApplyInfo.getStatus())) {
//推送机构信息变更申请消息（小程序）
sendOrgAuthInfo(orgApplyInfo.getOpenId(), orgApplyInfo.getId(), "2", orgApplyInfo.getComName());
//发送小程序、微信通知
NuWxNoticeEntity nuWxNotice = new NuWxNoticeEntity();
nuWxNotice.setOpenId(orgApplyInfo.getOpenId());
nuWxNotice.setIzRead("1");
nuWxNotice.setOrgCode(null);
nuWxNotice.setTitle("机构加盟审核");
nuWxNotice.setContent("您好，您提交的" + orgApplyInfo.getComName() + "机构加盟申请未通过");
nuWxNotice.setType("org_apply_audit_list");
nuWxNotice.setClientType(WxClientType.INSTITUTION.getCode());
wxNoticeApi.addNotice(nuWxNotice);
WxNoticeEntity wxNotice = new WxNoticeEntity();
wxNotice.setPageRoute("pages/index/index");
wxNotice.setThing1("机构加盟审核");
wxNotice.setThing4("审核未通过");
wxNotice.setLogMainInfo("机构加盟审核");
wxNoticeApi.sendWechartMessage_SHENHE(wxNotice, nuWxNotice);
}
//机构加盟审批流程
@ -266,60 +332,6 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
}
//小程序订阅推送模板信息
public Result sendOrgAuthInfo(String openId, String id, String type, String comName) {
try {
// 1. 获取access token
String accessToken = WechatMiniProgramUtils.getAccessToken();
// 2. 准备模板消息数据
// String templateId = "CJ6NDNV4mTTyOdYhbksyA_YjDORVemJRmzEVAUZMBis";
String templateId = "cWVzXm1C-iitx1gNFn1nZdijq9R_3fCv8vLbiqs9zww";
String page = "pages/index/index"; // 点击消息跳转的页面
Map<String, Object> 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<OrgApplyInfoMapper, Org
List<OrgAllInfoApiEntity> result = BeanUtil.copyToList(records, OrgAllInfoApiEntity.class);
return result;
}
/**
* 验证是否有变化
*
* @param orgApplyInfoApiEntity
* @return
*/
@Override
public boolean validateChanged(OrgApplyInfoApiEntity orgApplyInfoApiEntity) {
QueryWrapper<OrgApplyInfo> 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())
);
}
}

5
nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java
View File

@ -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("重复提交");
}

5
nursing-unit-api/src/main/java/com/nu/modules/wechat/employess/api/EmployessInfoApi.java
View File

@ -29,6 +29,11 @@ public class EmployessInfoApi {
@AutoLog(value = "员工咨询信息-新增或修改")
@PostMapping("/saveApiEmployess")
public Result<Object> 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("重复提交");
}

6
nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java
View File

@ -32,6 +32,12 @@ public class OrgApplyInfoApi {
@AutoLog(value = "新增/编辑机构加盟申请信息")
@PostMapping("/save")
public Result<Object> 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("重复提交");
}

2
nursing-unit-elder/nu-elder-api/nu-elder-local-api/src/main/java/com/nu/modules/elder/api/IElderInfoApi.java
View File

@ -11,4 +11,6 @@ public interface IElderInfoApi {
List<ElderInfoEntity> queryElders(String openId, String elderId);
void addElder(ElderInfoEntity elderInfoEn);
boolean validateChanged(String orgCode, ElderInfoEntity elderInfoEntity);
}

68
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java
View File

@ -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<ElderInfoMapper, ElderInfo
public List<ElderInfoEntity> queryElders(String openId, String elderId) {
QueryWrapper<ElderInfo> 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<ElderInfo> elderInfos = baseMapper.selectList(qw);
return BeanUtil.copyToList(elderInfos, ElderInfoEntity.class);
@ -62,4 +66,64 @@ public class ElderInfoServiceImpl extends ServiceImpl<ElderInfoMapper, ElderInfo
}
}
/**
* 验证是否有变化
*
* @param elderInfoEntity
* @return
*/
@DS("#orgCode")
@Override
public boolean validateChanged(String orgCode, ElderInfoEntity elderInfoEntity) {
QueryWrapper<ElderInfo> 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())){
// }
}
}