From 72eaf31a96dfbb875e48e51f455a425a7c12a0d9 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 7 Jan 2026 14:08:49 +0800 Subject: [PATCH] =?UTF-8?q?PC=E7=AB=AF=E9=95=BF=E8=80=85=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=81=E9=95=BF=E8=80=85=E4=BF=A1=E6=81=AF=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=B1=95=E7=A4=BA=E5=8C=BB=E4=BF=9D=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E5=A4=B1=E8=83=BD=E7=AD=89=E7=BA=A7=E3=80=81?= =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E7=8A=B6=E6=80=81=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ElderInfoController.java | 2 +- .../modules/elderinfo/entity/ElderInfo.java | 18 +++++++- .../elderinfo/mapper/ElderInfoMapper.java | 10 ++++- .../elderinfo/mapper/xml/ElderInfoMapper.xml | 42 +++++++++++++++++++ .../elderinfo/service/IElderInfoService.java | 5 +++ .../service/impl/ElderInfoServiceImpl.java | 18 +++++--- .../entity/ElderModifyInfo.java | 26 +++++++++--- .../mapper/ElderModifyInfoMapper.java | 1 + .../mapper/xml/ElderModifyInfoMapper.xml | 23 +++++++++- .../service/IElderModifyInfoService.java | 1 + .../impl/ElderModifyInfoServiceImpl.java | 4 ++ 11 files changed, 136 insertions(+), 14 deletions(-) diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/controller/ElderInfoController.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/controller/ElderInfoController.java index 46bf18e0..14ab6bf1 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/controller/ElderInfoController.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/controller/ElderInfoController.java @@ -62,7 +62,7 @@ public class ElderInfoController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(nuBizCustomerInfo, req.getParameterMap()); Page page = new Page(pageNo, pageSize); - IPage pageList = nuBizCustomerInfoService.page(page, queryWrapper); + IPage pageList = nuBizCustomerInfoService.pageList(page, queryWrapper); return Result.OK(pageList); } diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java index c25fb581..da7bf199 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java @@ -110,7 +110,7 @@ public class ElderInfo implements Serializable { /** * 长者缴费状态 字典elder_payment_status */ - @Excel(name = "医保类型", width = 15, dicCode = "elder_payment_status") + @Excel(name = "长者缴费状态", width = 15, dicCode = "elder_payment_status") @Dict(dicCode = "elder_payment_status") @ApiModelProperty(value = "长者缴费状态") private String paymentStatus; @@ -385,4 +385,20 @@ public class ElderInfo implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd") private Date checkinTime; + /** + * 医保类型中文名 + */ + @TableField(exist = false) + private String yblxName; + /** + * 失能等级中文名 + */ + @TableField(exist = false) + private String sndjName; + /** + * 缴费状态中文名 + */ + @TableField(exist = false) + private String jfztName; + } diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/ElderInfoMapper.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/ElderInfoMapper.java index e32f47db..2a8cbeee 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/ElderInfoMapper.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/ElderInfoMapper.java @@ -1,5 +1,9 @@ package com.nu.modules.elderinfo.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.entity.ElderInfoEntity; import com.nu.entity.ElderServerEntity; import com.nu.modules.elderinfo.entity.ElderInfo; @@ -11,7 +15,7 @@ import java.util.List; /** * @Description: 长者信息 * @Author: jeecg-boot - * @Date: 2025-04-11 + * @Date: 2025-04-11 * @Version: V1.0 */ public interface ElderInfoMapper extends BaseMapper { @@ -19,4 +23,8 @@ public interface ElderInfoMapper extends BaseMapper { List getElderServerList(@Param("params") ElderInfoEntity elderInfoEntity); void changeOrderly(ElderInfo elderInfo); + + ElderInfo selectInfoById(@Param("elderId") String elderId); + + IPage pageList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml index 2c828127..b543734f 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml @@ -19,4 +19,46 @@ where a.nu_id = #{params.nuId} and a.elder_id = #{params.id} + + diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/IElderInfoService.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/IElderInfoService.java index 1c0f432e..56b717f0 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/IElderInfoService.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/IElderInfoService.java @@ -1,5 +1,8 @@ package com.nu.modules.elderinfo.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.elderinfo.entity.ElderInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -25,4 +28,6 @@ public interface IElderInfoService extends IService { void elderAudit(ElderInfo elderInfo); void changeOrderly(ElderInfo elderInfo); + + IPage pageList(Page page, QueryWrapper queryWrapper); } 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 526f9896..fed33065 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 @@ -5,6 +5,8 @@ import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.nu.dto.ElderInfoMQDto; import com.nu.entity.ElderInfoEntity; @@ -74,17 +76,18 @@ public class ElderInfoServiceImpl extends ServiceImpl> getModifyInfo(ElderInfo elderInfo) { // 1. 查询当前使用中数据 - ElderInfo usingData = baseMapper.selectById(elderInfo.getId()); + ElderInfo usingData = baseMapper.selectInfoById(elderInfo.getId()); // 2. 查询变更后数据 + String modifyId = ""; QueryWrapper nowUseQW = new QueryWrapper<>(); if ("gua".equals(elderInfo.getQueryModifyType())) { - nowUseQW.eq("id", usingData.getGuardianModifyId()); + modifyId = usingData.getGuardianModifyId(); } else { - nowUseQW.eq("id", usingData.getElderModifyId()); + modifyId = usingData.getElderModifyId(); } - ElderModifyInfo modifyData = elderModifyInfoService.getOne(nowUseQW); + ElderModifyInfo modifyData = elderModifyInfoService.getInfoId(modifyId); // 3. 准备结果列表 List> result = new ArrayList<>(); @@ -102,7 +105,7 @@ public class ElderInfoServiceImpl extends ServiceImpl pageList(Page page, QueryWrapper queryWrapper) { + return baseMapper.pageList(page,queryWrapper); + } + @Override public List selectCurrentState3() { List elderInfos = baseMapper.selectList(new QueryWrapper().lambda().ne(ElderInfo::getCurrentState, "3")); diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/entity/ElderModifyInfo.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/entity/ElderModifyInfo.java index af54e7cb..6dfc700a 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/entity/ElderModifyInfo.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/entity/ElderModifyInfo.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import org.jeecg.common.constant.ProvinceCityArea; import org.jeecg.common.util.SpringContextUtils; import lombok.Data; @@ -87,6 +85,7 @@ public class ElderModifyInfo implements Serializable { /**医保类型*/ @Excel(name = "医保类型", width = 15) @ApiModelProperty(value = "医保类型") + @Dict(dicCode = "medical_insurance_type") private String medicalType; /** *长者失能等级报销类型 @@ -99,7 +98,7 @@ public class ElderModifyInfo implements Serializable { /** * 长者缴费状态 字典elder_payment_status */ - @Excel(name = "医保类型", width = 15, dicCode = "elder_payment_status") + @Excel(name = "长者缴费状态", width = 15, dicCode = "elder_payment_status") @Dict(dicCode = "elder_payment_status") @ApiModelProperty(value = "长者缴费状态") private String paymentStatus; @@ -255,4 +254,21 @@ public class ElderModifyInfo implements Serializable { @Excel(name = "兵役状况", width = 15) @ApiModelProperty(value = "兵役状况") private String militaryType; + + /** + * 医保类型中文名 + */ + @TableField(exist = false) + private String yblxName; + /** + * 失能等级中文名 + */ + @TableField(exist = false) + private String sndjName; + /** + * 缴费状态中文名 + */ + @TableField(exist = false) + private String jfztName; + } diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/mapper/ElderModifyInfoMapper.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/mapper/ElderModifyInfoMapper.java index 619b80f6..f5a22109 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/mapper/ElderModifyInfoMapper.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/mapper/ElderModifyInfoMapper.java @@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ElderModifyInfoMapper extends BaseMapper { + ElderModifyInfo getInfoId(@Param("id") String id); } diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/mapper/xml/ElderModifyInfoMapper.xml b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/mapper/xml/ElderModifyInfoMapper.xml index f1e0cf70..48f6ce0e 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/mapper/xml/ElderModifyInfoMapper.xml +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/mapper/xml/ElderModifyInfoMapper.xml @@ -2,4 +2,25 @@ - \ No newline at end of file + + diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/service/IElderModifyInfoService.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/service/IElderModifyInfoService.java index 595c5217..017d4d56 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/service/IElderModifyInfoService.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/service/IElderModifyInfoService.java @@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IElderModifyInfoService extends IService { + ElderModifyInfo getInfoId(String modifyId); } diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/service/impl/ElderModifyInfoServiceImpl.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/service/impl/ElderModifyInfoServiceImpl.java index 35a4abdd..0ccbfa1c 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/service/impl/ElderModifyInfoServiceImpl.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/service/impl/ElderModifyInfoServiceImpl.java @@ -16,4 +16,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ElderModifyInfoServiceImpl extends ServiceImpl implements IElderModifyInfoService { + @Override + public ElderModifyInfo getInfoId(String modifyId) { + return baseMapper.getInfoId(modifyId); + } }