From fa520d1cfa369dbc3a5f9b5d65ab8f3ea3655af3 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 30 Sep 2025 10:13:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0pad=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=80=81=E4=BA=BA=E7=9A=84=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nu/entity/ElderServerEntity.java | 74 +++++++++++++++++++ .../java/com/nu/entity/NuBaseInfoEntity.java | 4 +- .../nu/modules/elder/api/IElderInfoApi.java | 2 + .../elderinfo/mapper/ElderInfoMapper.java | 6 ++ .../elderinfo/mapper/xml/ElderInfoMapper.xml | 3 + .../service/impl/ElderInfoServiceImpl.java | 6 ++ .../com/nu/modules/qgd/entity/QgdInfo.java | 3 + .../qgd/service/impl/QgdMainServiceImpl.java | 62 +++++++++++++++- .../modules/nubaseinfo/entity/NuBaseInfo.java | 7 +- .../service/impl/NuBaseInfoServiceImpl.java | 15 ++-- 10 files changed, 161 insertions(+), 21 deletions(-) create mode 100644 nursing-unit-common/src/main/java/com/nu/entity/ElderServerEntity.java diff --git a/nursing-unit-common/src/main/java/com/nu/entity/ElderServerEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/ElderServerEntity.java new file mode 100644 index 00000000..7295f368 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/ElderServerEntity.java @@ -0,0 +1,74 @@ +package com.nu.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 护理单元客户配置服务指令 + * @Author: yangjun + * @Date: 2025-03-31 + * @Version: V1.0 + */ +@Data +public class ElderServerEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + private String id; + /**护理单元id*/ + private String nuId; + /**客户id*/ + private String customerId; + /**服务类别id*/ + private String categoryId; + /**服务类型id*/ + private String typeId; + /**服务指令id*/ + private String directiveId; + /**护理单元名称*/ + private String nuName; + /**客户姓名*/ + private String customerName; + /**服务类别名称*/ + private String categoryName; + /**服务类型名称*/ + private String typeName; + /**服务指令名称*/ + private String directiveName; + /**定位*/ + private String positioning; + /**服务标签名称*/ + private String tagName; + /**体型标签名称*/ + private String bodyTagName; + /**情绪标签名称*/ + private String emotionTagName; + /**周期类型*/ + private String cycleType; + /**纵向定位*/ + private String positioningLong; + + + /**开始时间*/ + private String startTime; + /**结束时间*/ + private String endTime; + /**创建人*/ + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + /**更新人*/ + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + /**所属部门*/ + private String sysOrgCode; +} diff --git a/nursing-unit-common/src/main/java/com/nu/entity/NuBaseInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/NuBaseInfoEntity.java index e59670b9..ccde27fd 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/NuBaseInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/NuBaseInfoEntity.java @@ -83,10 +83,8 @@ public class NuBaseInfoEntity implements Serializable { private BigDecimal balance; //摄像头信息 private List cameraInfo; - //客户信息 - private CustomerInfoEntity customerInfo; //指令信息 - private List customerDirectiveDtoList; + private List elderServerEntityList; //温湿度信息 正常一个nuid对应一条数据 private List humidDeviceList; //长者信息 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 c873838f..95b37641 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 @@ -1,6 +1,7 @@ package com.nu.modules.elder.api; import com.nu.entity.ElderInfoEntity; +import com.nu.entity.ElderServerEntity; import java.util.List; @@ -14,4 +15,5 @@ public interface IElderInfoApi { List queryByElderIds(String[] split); + List getElderServerList(ElderInfoEntity customerInfo); } 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 cdd9f9ab..d30330c4 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,7 +1,12 @@ package com.nu.modules.elderinfo.mapper; +import com.nu.entity.ElderInfoEntity; +import com.nu.entity.ElderServerEntity; import com.nu.modules.elderinfo.entity.ElderInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @Description: 长者信息 @@ -11,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ElderInfoMapper extends BaseMapper { + List getElderServerList(@Param("params") ElderInfoEntity elderInfoEntity); } 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 3cd1941c..3013791c 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 @@ -2,4 +2,7 @@ + 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 f89afcc7..75bf581b 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 @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.dto.ElderInfoMQDto; import com.nu.dto.EmployeesApplyMQDto; import com.nu.entity.ElderInfoEntity; +import com.nu.entity.ElderServerEntity; import com.nu.modules.elder.api.IElderInfoApi; import com.nu.modules.elderinfo.entity.ElderInfo; import com.nu.modules.elderinfo.mapper.ElderInfoMapper; @@ -283,4 +284,9 @@ public class ElderInfoServiceImpl extends ServiceImpl getElderServerList(ElderInfoEntity elderInfoEntity) { + return baseMapper.getElderServerList(elderInfoEntity); + } + } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java index 3ebf818f..7d886464 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java @@ -110,4 +110,7 @@ public class QgdInfo implements Serializable { @ApiModelProperty(value = "库房") private java.lang.String nuId; + /**参考单价*/ + private java.lang.String referenceUnitPrice; + } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdMainServiceImpl.java index cd5a73c4..ba6df68a 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdMainServiceImpl.java @@ -1,6 +1,14 @@ package com.nu.modules.qgd.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.nu.modules.cgd.entity.NuInvoicingCgdInfo; +import com.nu.modules.cgd.entity.NuInvoicingCgdMain; +import com.nu.modules.cgd.mapper.NuInvoicingCgdInfoMapper; +import com.nu.modules.cgd.mapper.NuInvoicingCgdMainMapper; +import com.nu.modules.cgd.service.INuInvoicingCgdMainService; +import com.nu.modules.configSuppliersInfo.entity.ConfigSuppliersInfo; +import com.nu.modules.configSuppliersInfo.mapper.ConfigSuppliersInfoMapper; +import com.nu.modules.configSuppliersInfo.service.IConfigSuppliersInfoService; import com.nu.modules.qgd.entity.QgdInfo; import com.nu.modules.qgd.entity.QgdMain; import com.nu.modules.qgd.mapper.QgdInfoMapper; @@ -16,10 +24,8 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.text.SimpleDateFormat; +import java.util.*; /** * @Description: 请购单 @@ -33,6 +39,13 @@ public class QgdMainServiceImpl extends ServiceImpl impl @Autowired private QgdInfoMapper qgdInfoMapper; + @Autowired + private NuInvoicingCgdMainMapper cgdMainMapper; + @Autowired + private NuInvoicingCgdInfoMapper cgdInfoMapper; + @Autowired + private ConfigSuppliersInfoMapper gysMapper; + @Override public String addCgdByUser(QgdInfo nuInvoicingQgdInfo) { @@ -67,12 +80,53 @@ public class QgdMainServiceImpl extends ServiceImpl impl Map map = new HashMap<>(); String suppliersId = entry.getKey();//供应商id List infoList = entry.getValue();//请购的物料列表 + + ConfigSuppliersInfo ConfigSuppliersInfo = gysMapper.selectById(suppliersId); + String cgdNo = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + String.format("%06d", new Random().nextInt(1000000)); + + //生产采购单主表 + NuInvoicingCgdMain cgdMain = new NuInvoicingCgdMain(); + cgdMain.setQgdId(qgdMain.getId()); + cgdMain.setCgdNo(cgdNo); + cgdMain.setGysId(suppliersId); + cgdMain.setQgDate(new Date()); + cgdMain.setQgBy(sysUser.getUsername()); + cgdMain.setGysLxr(ConfigSuppliersInfo.getPersonInCharge()); + cgdMain.setGysLxrdh(ConfigSuppliersInfo.getContactNumber()); + cgdMain.setGysOpenId(ConfigSuppliersInfo.getWechartId()); + cgdMain.setStatus("0"); + cgdMain.setCgdType("0"); + cgdMainMapper.insert(cgdMain); + //生产采购单详细 + for(QgdInfo params:infoList){ + NuInvoicingCgdInfo cgdInfo = new NuInvoicingCgdInfo(); + cgdInfo.setMainId(qgdMain.getId()); + cgdInfo.setCgdId(cgdMain.getId()); + cgdInfo.setWlId(params.getWlId()); + cgdInfo.setWlMaterialNo(params.getWlMaterialNo()); + cgdInfo.setWlName(params.getWlName()); + cgdInfo.setWlUnits(params.getWlUnits()); + cgdInfo.setWlSpecificationModel(params.getWlSpecificationModel()); + cgdInfo.setWlUpperLimit(params.getWlUpperLimit()); + cgdInfo.setWlLowerLimit(params.getWlLowerLimit()); + cgdInfo.setSuppliersId(params.getSuppliersId()); + cgdInfo.setSuppliersName(params.getSuppliersName()); + cgdInfo.setPurchaseQuantity(params.getPurchaseQuantity()); + cgdInfo.setBrand(params.getBrand()); + cgdInfo.setNuId(params.getNuId()); + cgdInfo.setProcurementPrice(params.getReferenceUnitPrice()); + cgdInfoMapper.insert(cgdInfo); + } + + map.put("suppliersId", entry.getKey()); map.put("qgdInfoList", entry.getValue()); mapList.add(map); } System.out.println(mapList); + + return "1"; } } diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java index 58df5ebc..074a97cb 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java @@ -2,10 +2,7 @@ package com.nu.modules.nubaseinfo.entity; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; -import com.nu.entity.CameraInfoEntity; -import com.nu.entity.CustomerDirectiveEntity; -import com.nu.entity.CustomerInfoEntity; -import com.nu.entity.ElderInfoEntity; +import com.nu.entity.*; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -164,5 +161,7 @@ public class NuBaseInfo implements Serializable { //客户指令信息 @TableField(exist = false) private List customerDirectiveDtoList; + @TableField(exist = false) + private List elderServerEntityList; } diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java index 89904d5b..86901375 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java @@ -8,10 +8,7 @@ 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.entity.CameraInfoEntity; -import com.nu.entity.CustomerInfoEntity; -import com.nu.entity.ElderInfoEntity; -import com.nu.entity.NuBaseInfoEntity; +import com.nu.entity.*; import com.nu.modules.camerainfo.api.CameraInfoApi; import com.nu.modules.elder.api.IElderInfoApi; import com.nu.modules.nubaseinfo.entity.NuBaseInfo; @@ -158,12 +155,10 @@ public class NuBaseInfoServiceImpl extends ServiceImpl customerDirectiveList = nuCustomerDirectiveService.list(new QueryWrapper().lambda().eq(NuCustomerDirective::getCustomerId,customerInfo.getId())); -// if(customerDirectiveList != null && customerDirectiveList.size() > 0){ -// List customerDirectiveDtoList = new ArrayList<>(); -// BeanUtils.copyProperties(customerDirectiveList,customerDirectiveDtoList); -// nuBaseInfoApiDto.setCustomerDirectiveDtoList(customerDirectiveDtoList); -// } + List customerDirectiveList = elderInfoApi.getElderServerList(customerInfo); + if(customerDirectiveList != null && customerDirectiveList.size() > 0){ + ni.setElderServerEntityList(customerDirectiveList); + } } }); });