From 65a0203482a9f4db9f5a4137e11af18f1b308667 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 5 Nov 2025 14:08:39 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=91=98=E5=B7=A5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=8E=A5=E5=8D=95=E4=B8=8A=E9=99=90=E8=AE=BE=E7=BD=AE=202?= =?UTF-8?q?=E3=80=81=E9=95=BF=E8=80=85=E5=A2=9E=E5=8A=A0=E6=8C=87=E6=B4=BE?= =?UTF-8?q?=E6=8A=A4=E7=90=86=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ElderInfoController.java | 16 ++++++++++++- .../modules/elderinfo/entity/ElderInfo.java | 6 +++++ .../elderinfo/mapper/ElderInfoMapper.java | 2 ++ .../elderinfo/mapper/xml/ElderInfoMapper.xml | 24 ++++++++++++++----- .../elderinfo/service/IElderInfoService.java | 2 ++ .../service/impl/ElderInfoServiceImpl.java | 5 ++++ .../entity/BizEmployeesInfo.java | 4 ++++ 7 files changed, 52 insertions(+), 7 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 19d97063..46bf18e0 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 @@ -69,7 +69,7 @@ public class ElderInfoController extends JeecgController changeOrderly(@RequestBody ElderInfo elderInfo) { + elderInfoService.changeOrderly(elderInfo); + return Result.OK("变更成功!"); + } } 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 58866510..d7eb36be 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 @@ -356,4 +356,10 @@ public class ElderInfo implements Serializable { @TableField(exist = false) private String auditContent; + /** + * 护理员nu_biz_employees_info.id + */ + @Dict(dictTable = "nu_biz_employees_info",dicCode = "id",dicText = "name") + private java.lang.String orderly; + } 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 d30330c4..e32f47db 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 @@ -17,4 +17,6 @@ import java.util.List; public interface ElderInfoMapper extends BaseMapper { List getElderServerList(@Param("params") ElderInfoEntity elderInfoEntity); + + void changeOrderly(ElderInfo elderInfo); } 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 0f555e29..92f81a88 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 @@ -1,15 +1,27 @@ + + update nu_biz_elder_info + set orderly = + + #{orderly} + + + null + + where id = #{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 e4a451de..1c0f432e 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 @@ -23,4 +23,6 @@ public interface IElderInfoService extends IService { void guaAudit(ElderInfo elderInfo); void elderAudit(ElderInfo elderInfo); + + void changeOrderly(ElderInfo elderInfo); } 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 62b4ded5..526f9896 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 @@ -251,6 +251,11 @@ public class ElderInfoServiceImpl extends ServiceImpl selectCurrentState3() { List elderInfos = baseMapper.selectList(new QueryWrapper().lambda().ne(ElderInfo::getCurrentState, "3")); diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/BizEmployeesInfo.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/BizEmployeesInfo.java index 86bb2f65..bf3d9083 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/BizEmployeesInfo.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/BizEmployeesInfo.java @@ -237,4 +237,8 @@ public class BizEmployeesInfo implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd") @DateTimeFormat(pattern="yyyy.MM.dd") private Date endTime; + + /**接单上限*/ + @ApiModelProperty(value = "接单上限") + private Integer orderCap; }