From 4bff344d3ce0bab0708ca63339120610d368553f Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 3 Mar 2026 15:07:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu/modules/suppliers/ISuppliersApi.java | 5 ++ .../NuBizSuppliersMaterialInfoMapper.java | 4 + .../xml/NuBizSuppliersMaterialInfoMapper.xml | 10 +++ .../impl/NuBizSuppliersApplyServiceImpl.java | 24 ++++++ .../wechat/suppliers/SuppliersApi.java | 20 +++++ .../com/nu/dto/SuppliersMaterialInfoDto.java | 77 +++++++++++++++++++ 6 files changed, 140 insertions(+) create mode 100644 nursing-unit-common/src/main/java/com/nu/dto/SuppliersMaterialInfoDto.java diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/suppliers/ISuppliersApi.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/suppliers/ISuppliersApi.java index 2f5e2b3..cb5a618 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/suppliers/ISuppliersApi.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/suppliers/ISuppliersApi.java @@ -1,6 +1,7 @@ package com.nu.modules.suppliers; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.nu.dto.SuppliersMaterialInfoDto; import com.nu.entity.NuBillEntity; import com.nu.entity.SuppliersApplyEntity; import com.nu.entity.SuppliersOrgAllEntity; @@ -28,4 +29,8 @@ public interface ISuppliersApi { boolean nameDuplicateChecked(SuppliersApplyEntity suppliersApplyEntity); SuppliersApplyEntity getSuppliersApplyInfo(String openId); + + IPage getSuppliersWlInfo(Integer pageNo, Integer pageSize, String title,String suppliersId); + + SuppliersMaterialInfoDto editSuppliersWlInfo(SuppliersMaterialInfoDto suppliersMaterialInfoDto); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/NuBizSuppliersMaterialInfoMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/NuBizSuppliersMaterialInfoMapper.java index 581cc08..58c9794 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/NuBizSuppliersMaterialInfoMapper.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/NuBizSuppliersMaterialInfoMapper.java @@ -2,6 +2,8 @@ package com.nu.modules.bizSuppliers.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.nu.dto.SuppliersMaterialInfoDto; import org.apache.ibatis.annotations.Param; import com.nu.modules.bizSuppliers.entity.NuBizSuppliersMaterialInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -15,4 +17,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface NuBizSuppliersMaterialInfoMapper extends BaseMapper { List noList(@Param("list") List list); + + IPage getSuppliersWlInfo(IPage page, @Param("title") String title, @Param("suppliersId") String suppliersId); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersMaterialInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersMaterialInfoMapper.xml index 2b536b8..3c0b98c 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersMaterialInfoMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersMaterialInfoMapper.xml @@ -20,4 +20,14 @@ AND nu_biz_suppliers_material_info.brand_type = exclude.brandType ) + + + + \ No newline at end of file diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java index 483f6b6..44370d9 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java @@ -9,14 +9,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Maps; import com.nu.dto.SuppliersInfoMQDto; +import com.nu.dto.SuppliersMaterialInfoDto; import com.nu.entity.*; import com.nu.enums.WxClientType; import com.nu.modules.EmployeesInfo.api.IEmployeesAdvisioryInfoApi; import com.nu.modules.bizSuppliers.entity.NuBizSuppliersApply; import com.nu.modules.bizSuppliers.entity.NuBizSuppliersInfo; +import com.nu.modules.bizSuppliers.entity.NuBizSuppliersMaterialInfo; import com.nu.modules.bizSuppliers.entity.NuBizSuppliersOrg; import com.nu.modules.bizSuppliers.mapper.NuBizSuppliersApplyMapper; import com.nu.modules.bizSuppliers.mapper.NuBizSuppliersInfoMapper; +import com.nu.modules.bizSuppliers.mapper.NuBizSuppliersMaterialInfoMapper; import com.nu.modules.bizSuppliers.mapper.NuBizSuppliersOrgMapper; import com.nu.modules.bizSuppliers.service.INuBizSuppliersApplyService; import com.nu.modules.bizSuppliers.service.INuBizSuppliersOrgService; @@ -55,6 +58,9 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl getSuppliersWlInfo(Integer pageNo, Integer pageSize, String title,String suppliersId) { + + IPage page = new Page<>(pageNo, pageSize); + IPage list = nuBizSuppliersMaterialInfoMapper.getSuppliersWlInfo(page, title, suppliersId); + return null; + } + + @Override + public SuppliersMaterialInfoDto editSuppliersWlInfo(SuppliersMaterialInfoDto suppliersMaterialInfoDto) { + NuBizSuppliersMaterialInfo nuBizSuppliersMaterialInfo = new NuBizSuppliersMaterialInfo(); + nuBizSuppliersMaterialInfo.setId(suppliersMaterialInfoDto.getId()); + nuBizSuppliersMaterialInfo.setSalesUnit(suppliersMaterialInfoDto.getSalesUnit()); + nuBizSuppliersMaterialInfo.setSalesUnitPrice(suppliersMaterialInfoDto.getSalesUnitPrice()); + nuBizSuppliersMaterialInfoMapper.updateById(nuBizSuppliersMaterialInfo); + return suppliersMaterialInfoDto; + } + @Override public IPage listPage(Page page, QueryWrapper queryWrapper) { return baseMapper.listPage(page, queryWrapper); diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/suppliers/SuppliersApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/suppliers/SuppliersApi.java index 8bb74c0..c26ee85 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/suppliers/SuppliersApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/suppliers/SuppliersApi.java @@ -2,6 +2,7 @@ package com.nu.modules.wechat.suppliers; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.collect.Maps; +import com.nu.dto.SuppliersMaterialInfoDto; import com.nu.entity.EmployeesOrgApiEntity; import com.nu.entity.SuppliersApplyEntity; import com.nu.entity.SuppliersOrgAllEntity; @@ -144,4 +145,23 @@ public class SuppliersApi { return Result.OK(result); } + + + @GetMapping(value = "/getSuppliersWlInfo") + public Result> getSuppliersWlInfo( + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "8") Integer pageSize, + @RequestParam(value = "title",required = false) String title, + @RequestParam(value = "suppliersId") String suppliersId) { + IPage result = suppliersApi.getSuppliersWlInfo(pageNo, pageSize, title,suppliersId); + return Result.OK(result); + } + + + @PostMapping(value = "/editSuppliersWlInfo") + public Result editSuppliersWlInfo(@RequestBody SuppliersMaterialInfoDto suppliersMaterialInfoDto) { + SuppliersMaterialInfoDto res = suppliersApi.editSuppliersWlInfo(suppliersMaterialInfoDto); + return Result.OK(res); + } + } diff --git a/nursing-unit-common/src/main/java/com/nu/dto/SuppliersMaterialInfoDto.java b/nursing-unit-common/src/main/java/com/nu/dto/SuppliersMaterialInfoDto.java new file mode 100644 index 0000000..64ed094 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/dto/SuppliersMaterialInfoDto.java @@ -0,0 +1,77 @@ +package com.nu.dto; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Description: 供应商可提供的物料信息 + * @Author: jeecg-boot + * @Date: 2026-02-28 + * @Version: V1.0 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +public class SuppliersMaterialInfoDto implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**供应商*/ + @Excel(name = "供应商", width = 15, dictTable = "nu_biz_suppliers_info", dicText = "suppliers_name", dicCode = "id") + @Dict(dictTable = "nu_biz_suppliers_info", dicText = "suppliers_name", dicCode = "id") + @ApiModelProperty(value = "供应商") + private String suppliersId; + /**货品名称*/ + @Excel(name = "货品名称", width = 15) + @ApiModelProperty(value = "货品名称") + private String materialName; + /**规格型号*/ + @Excel(name = "规格型号", width = 15) + @ApiModelProperty(value = "规格型号") + private String specificationModel; + /**品牌型号*/ + @Excel(name = "品牌型号", width = 15) + @ApiModelProperty(value = "品牌型号") + private String brandType; + /**销售单价*/ + @Excel(name = "销售单价", width = 15) + @ApiModelProperty(value = "销售单价") + private BigDecimal salesUnitPrice; + /**销售单位*/ + @Excel(name = "销售单位", width = 15) + @ApiModelProperty(value = "销售单位") + private String salesUnit; +}