diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/allMaterialInfo/entity/NuBizAllMaterialInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/allMaterialInfo/entity/NuBizAllMaterialInfo.java index e548c42..c6c188d 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/allMaterialInfo/entity/NuBizAllMaterialInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/allMaterialInfo/entity/NuBizAllMaterialInfo.java @@ -80,6 +80,11 @@ public class NuBizAllMaterialInfo implements Serializable { @Excel(name = "销售单位", width = 15) @ApiModelProperty(value = "销售单位") private java.lang.String salesUnit; + @Dict(dicCode = "iz_enabled") + private java.lang.String izEnabled; + private java.lang.String materialNo; + private java.lang.String orgCode; + private java.lang.String departName; /**是否提供*/ @Excel(name = "是否提供", width = 15, dicCode = "yn") @TableField(exist = false) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/controller/NuBaseInfoController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/controller/NuBaseInfoController.java new file mode 100644 index 0000000..51b96c6 --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/controller/NuBaseInfoController.java @@ -0,0 +1,112 @@ +package com.nu.modules.baseinfo.controller; + +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.baseinfo.entity.NuBaseInfo; +import com.nu.modules.baseinfo.service.INuBaseInfoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.query.QueryRuleEnum; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.Map; + +/** + * @Description: 护理单元 + * @Author: jeecg-boot + * @Date: 2025-04-11 + * @Version: V1.0 + */ +@Api(tags = "护理单元") +@RestController +@RequestMapping("/nuBaseInfo/nuBaseInfo") +@Slf4j +public class NuBaseInfoController extends JeecgController { + @Autowired + private INuBaseInfoService nuBaseInfoService; + + /** + * 分页列表查询 + * + * @param nuBaseInfo + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "护理单元-分页列表查询") + @ApiOperation(value = "护理单元-分页列表查询", notes = "护理单元-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(NuBaseInfo nuBaseInfo, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + Map customeRuleMap = new HashMap<>(); + customeRuleMap.put("area_flag", QueryRuleEnum.LIKE_WITH_OR); + customeRuleMap.put("status", QueryRuleEnum.LIKE_WITH_OR); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuBaseInfo, req.getParameterMap(), customeRuleMap); + Page page = new Page(pageNo, pageSize); + IPage pageList = nuBaseInfoService.getList(nuBaseInfo.getSysOrgCode(),page, queryWrapper); + return Result.OK(pageList); + } + + + + /** + * 护理单元-入住信息分页列表查询 + * + * @param nuBaseInfo + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "护理单元-分页列表查询") + @ApiOperation(value = "护理单元-入住信息分页列表查询", notes = "护理单元-入住信息分页列表查询") + @GetMapping(value = "/queryNuOccupancyInfoList") + public Result> queryNuOccupancyInfoList(NuBaseInfo nuBaseInfo, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + Map customeRuleMap = new HashMap<>(); + customeRuleMap.put("nu_name", QueryRuleEnum.LIKE_WITH_OR); + customeRuleMap.put("nu_id", QueryRuleEnum.LIKE_WITH_OR); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuBaseInfo, req.getParameterMap(), customeRuleMap); + queryWrapper.eq("area_flag","1"); + Page page = new Page(pageNo, pageSize); + IPage pageList = nuBaseInfoService.page(page, queryWrapper); + + return Result.OK(pageList); + } + + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "护理单元-通过id查询") + @ApiOperation(value = "护理单元-通过id查询", notes = "护理单元-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + NuBaseInfo nuBaseInfo = nuBaseInfoService.getById(id); + if (nuBaseInfo == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(nuBaseInfo); + } + + +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/entity/NuBaseInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/entity/NuBaseInfo.java index b1e068b..e5f170d 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/entity/NuBaseInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/entity/NuBaseInfo.java @@ -61,7 +61,6 @@ public class NuBaseInfo implements Serializable { * 区域标签ID */ @Excel(name = "区域标签ID", width = 15, dicCode = "nu_type") - @Dict(dicCode = "nu_type") @ApiModelProperty(value = "区域标签ID") private java.lang.String areaFlag; /** diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/service/INuBaseInfoService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/service/INuBaseInfoService.java index 92a5a9e..4676337 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/service/INuBaseInfoService.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/service/INuBaseInfoService.java @@ -1,5 +1,8 @@ package com.nu.modules.baseinfo.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.baomidou.mybatisplus.extension.service.IService; import com.nu.modules.baseinfo.entity.NuBaseInfo; @@ -11,4 +14,5 @@ import com.nu.modules.baseinfo.entity.NuBaseInfo; */ public interface INuBaseInfoService extends IService { + IPage getList(String sysOrgCode,Page page, QueryWrapper queryWrapper); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/service/impl/NuBaseInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/service/impl/NuBaseInfoServiceImpl.java index 0af417d..b3fd4f7 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/service/impl/NuBaseInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/service/impl/NuBaseInfoServiceImpl.java @@ -3,6 +3,8 @@ package com.nu.modules.baseinfo.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.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.entity.NuBaseInfoEntity; import com.nu.modules.baseinfo.api.INuBaseInfoApi; @@ -120,4 +122,10 @@ public class NuBaseInfoServiceImpl extends ServiceImpl getList(String sysOrgCode,Page page, QueryWrapper queryWrapper) { + return baseMapper.selectPage(page, queryWrapper); + } } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/controller/NuEmployeesAdvisoryInfoController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/controller/NuEmployeesAdvisoryInfoController.java index dec6227..1530113 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/controller/NuEmployeesAdvisoryInfoController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/controller/NuEmployeesAdvisoryInfoController.java @@ -58,6 +58,18 @@ public class NuEmployeesAdvisoryInfoController extends JeecgController> getTjList(NuEmployeesAdvisoryInfo nuEmployeesAdvisoryInfo, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuEmployeesAdvisoryInfo, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = nuEmployeesAdvisoryInfoService.getTjList(page, queryWrapper); + return Result.OK(pageList); + } + /** * 添加 * diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/NuEmployeesAdvisoryInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/NuEmployeesAdvisoryInfo.java index 327ee85..e5f262a 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/NuEmployeesAdvisoryInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/NuEmployeesAdvisoryInfo.java @@ -307,4 +307,10 @@ public class NuEmployeesAdvisoryInfo implements Serializable { private String serverUrl; @TableField(exist = false) private String modifyStatus; + @TableField(exist = false) + private String departName; + @TableField(exist = false) + private String entryTime; + @TableField(exist = false) + private String orgCode; } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/NuEmployeesAdvisoryInfoMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/NuEmployeesAdvisoryInfoMapper.java index 6fa3663..f0670de 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/NuEmployeesAdvisoryInfoMapper.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/NuEmployeesAdvisoryInfoMapper.java @@ -1,5 +1,9 @@ package com.nu.modules.employees.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.EmployeesAdvisoryInfoEntity; import com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -24,4 +28,6 @@ public interface NuEmployeesAdvisoryInfoMapper extends BaseMapper getTjList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml index c4e8382..fe0a527 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml @@ -103,4 +103,14 @@ WHERE id = #{id} + diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/INuEmployeesAdvisoryInfoService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/INuEmployeesAdvisoryInfoService.java index e345301..e94767a 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/INuEmployeesAdvisoryInfoService.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/INuEmployeesAdvisoryInfoService.java @@ -1,5 +1,8 @@ package com.nu.modules.employees.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.baomidou.mybatisplus.extension.service.IService; import com.nu.dto.EmployeesStatusMQDto; import com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo; @@ -13,4 +16,6 @@ import com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo; public interface INuEmployeesAdvisoryInfoService extends IService { void sendYgrz(EmployeesStatusMQDto dto); + + IPage getTjList(Page page, QueryWrapper queryWrapper); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java index 1a3dfe7..e1cb4d3 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.Date; import java.util.List; /** @@ -167,7 +168,7 @@ public class EmployeesOrgServiceImpl extends ServiceImpl getTjList(Page page, QueryWrapper queryWrapper) { + return baseMapper.getTjList(page, queryWrapper); + } + @Override public JSONObject getEmployeeInfo(String tel) { JSONObject resultData = new JSONObject(); diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java index ab6f12d..2ff849b 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java @@ -61,7 +61,7 @@ public class EmployeesMQListener { employeesOrg.setStatus(dto.getAuditStatus()); employeesOrg.setAuditContent(dto.getAuditContent()); if ("2".equals(dto.getAuditStatus())) { - employeesOrg.setEntryTime(dto.getEntryTime());//审批通过的话将入职时间设置进去 + employeesOrg.setEntryTime(new Date());//审批通过的话将入职时间设置进去 //修改员工注册表的入驻状态 NuEmployeesAdvisoryInfo employeesAd = new NuEmployeesAdvisoryInfo(); employeesAd.setId(dto.getEmployeeId()); 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 new file mode 100644 index 0000000..bf0fb75 --- /dev/null +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/controller/ElderInfoController.java @@ -0,0 +1,55 @@ +package com.nu.modules.elderinfo.controller; + +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.nu.modules.elderinfo.service.IElderInfoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; + +/** + * @Description: 长者标签备份子表 + * @Author: jeecg-boot + * @Date: 2025-08-25 + * @Version: V1.0 + */ +@Api(tags = "长者标签备份子表") +@RestController +@RequestMapping("/elderInfo/elderInfo") +@Slf4j +public class ElderInfoController extends JeecgController { + @Autowired + private IElderInfoService elderInfoService; + + /** + * 分页列表查询 + * + * @param elderInfo + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "长者标签备份子表-分页列表查询") + @ApiOperation(value = "长者信息-分页列表查询", notes = "长者信息-分页列表查询") + @GetMapping(value = "/getElderTjList") + public Result> getElderTjList(ElderInfo elderInfo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(elderInfo, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = elderInfoService.getElderTjList(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 6c4b938..ed247c8 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 @@ -39,7 +39,6 @@ public class ElderInfo implements Serializable { */ @Excel(name = "护理单元", width = 15) @ApiModelProperty(value = "护理单元") - @Dict(dicCode = "nu_id", dicText = "nu_name", dictTable = "nu_base_info") private java.lang.String nuId; /** * 姓名 @@ -369,6 +368,8 @@ public class ElderInfo implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date checkinTime; + private String headPath;//长者头像 + private String guardianHeadPath;//监护人头像 /** * 医保类型中文名 @@ -385,7 +386,10 @@ public class ElderInfo implements Serializable { */ @TableField(exist = false) private String jfztName; - private String headPath;//长者头像 - private String guardianHeadPath;//监护人头像 + + @TableField(exist = false) + private String nuName; + @TableField(exist = false) + private String departName; } 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 73b4f05..9c86889 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.modules.elderinfo.entity.ElderInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -24,4 +28,6 @@ public interface ElderInfoMapper extends BaseMapper { * @return */ List selectModifyHisByOpenId(@Param("openId") String openId); + + IPage getElderTjList(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 c966872..cf2cea6 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 @@ -35,4 +35,15 @@ where mi.guardian_open_id = #{openId} and mi.modify_status != '0' + + + + 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 54333f9..714a6ef 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; @@ -11,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IElderInfoService extends IService { + IPage getElderTjList(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 c45b8dd..b843ec9 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 @@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.entity.ElderInfoEntity; import com.nu.modules.elder.api.IElderInfoApi; @@ -201,4 +203,9 @@ public class ElderInfoServiceImpl extends ServiceImpl getElderTjList(Page page, QueryWrapper queryWrapper) { + return baseMapper.getElderTjList(page,queryWrapper); + } } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java index d8ae682..53a704c 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java @@ -49,7 +49,6 @@ public class ConfigMaterialInfoServiceImpl extends ServiceImpl list = sysDataSourceService.list(queryWrapper); // 使用Set去重 - Set uniqueKeys = new HashSet<>(); List distinctList = new ArrayList<>(); // 2.查询所有的可用数据 @@ -63,23 +62,16 @@ public class ConfigMaterialInfoServiceImpl extends ServiceImpl list1 = configMaterialInfoService.queryList(dataSourceCode); for (ConfigMaterialInfo config : list1) { - // 创建唯一键 - String uniqueKey = config.getMaterialName() + "|" + - config.getSpecificationModel() + "|" + - config.getBrandType() + "|" + - config.getManufacturer(); - - // 去重 - if (!uniqueKeys.contains(uniqueKey)) { - uniqueKeys.add(uniqueKey); - - NuBizAllMaterialInfo lsbl = new NuBizAllMaterialInfo(); - lsbl.setMaterialName(config.getMaterialName()); - lsbl.setSpecificationModel(config.getSpecificationModel()); - lsbl.setBrandType(config.getBrandType()); - lsbl.setManufacturer(config.getManufacturer()); - distinctList.add(lsbl); - } + NuBizAllMaterialInfo lsbl = new NuBizAllMaterialInfo(); + lsbl.setMaterialName(config.getMaterialName()); + lsbl.setSpecificationModel(config.getSpecificationModel()); + lsbl.setBrandType(config.getBrandType()); + lsbl.setManufacturer(config.getManufacturer()); + lsbl.setMaterialNo(config.getMaterialNo()); + lsbl.setIzEnabled(config.getIzEnabled()); + lsbl.setOrgCode(sysDataSource.getCode()); + lsbl.setDepartName(sysDataSource.getName()); + distinctList.add(lsbl); } } catch (Exception e) { e.printStackTrace();