From a9b01023bcc7d635f174161d8b81429fab4aaa18 Mon Sep 17 00:00:00 2001 From: duhe Date: Fri, 28 Feb 2025 17:37:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=20up=20by=20dh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openhis-server/core-admin/pom.xml | 74 ++++----- .../SupplierManagementController.java | 155 ++++++++++++------ .../web/datadictionary/dto/SupplierDto.java | 4 + .../datadictionary/dto/SupplierInitDto.java | 33 ++++ .../dto/SupplierSearchParam.java | 7 +- .../web/datadictionary/dto/SupplierUpDto.java | 71 ++++++++ .../service/ISupplierService.java | 14 +- .../service/impl/SupplierServiceImpl.java | 52 +++--- 8 files changed, 277 insertions(+), 133 deletions(-) create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierInitDto.java create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierUpDto.java diff --git a/openhis-server/core-admin/pom.xml b/openhis-server/core-admin/pom.xml index aae6c29b..227e9fe0 100644 --- a/openhis-server/core-admin/pom.xml +++ b/openhis-server/core-admin/pom.xml @@ -71,42 +71,42 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java index dbcdaed0..338f10d9 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java @@ -3,25 +3,29 @@ */ package com.openhis.web.datadictionary.controller; +import java.util.Arrays; +import java.util.HashSet; import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.stream.Collectors; +import java.util.stream.Stream; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.MessageUtils; import com.core.common.utils.bean.BeanUtils; import com.openhis.administration.domain.Supplier; +import com.openhis.administration.mapper.SupplierMapper; import com.openhis.administration.service.ISupplierService; import com.openhis.common.constant.PromptMsgConstant; -import com.openhis.web.datadictionary.dto.SupplierDto; -import com.openhis.web.datadictionary.dto.SupplierSearchParam; +import com.openhis.common.enums.SupplierType; +import com.openhis.common.utils.HisPageUtils; +import com.openhis.common.utils.HisQueryUtils; +import com.openhis.web.datadictionary.dto.*; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.openhis.clinical.domain.ConditionDefinition; -import com.openhis.clinical.service.IConditionDefinitionService; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -34,81 +38,86 @@ import javax.servlet.http.HttpServletRequest; * @date 2025-02-21 */ @RestController -@RequestMapping("/data-dictionary-supplier") +@RequestMapping("/data-dictionary/supplier") @Slf4j @AllArgsConstructor public class SupplierManagementController { private final ISupplierService supplierService; + private final SupplierMapper supplierMapper; + + /** + * 厂商/产地初始化 + * + * @return + */ + @GetMapping("/information-init") + public R getSupplierInit() { + SupplierInitDto supplierInitDto = new SupplierInitDto(); + // 获取厂商/产地种类 + List supplierTypeOption = Stream.of(SupplierType.values()) + .map(status -> new SupplierInitDto.supplierTypeOption(status.getValue(), status.getInfo())) + .collect(Collectors.toList()); + supplierInitDto.setSupplierTypeOptions(supplierTypeOption); + return R.ok(supplierInitDto); + } /** * 厂商/产地查询 * * @param supplierSearchParam 查询条件 + * @param searchKey 查询条件-模糊查询 * @param pageNo 查询条件 * @param pageSize 查询条件 * @return 厂商/产地查询结果 */ @GetMapping(value = "/get-supplier-list") public R getSupplierList(SupplierSearchParam supplierSearchParam, + @RequestParam(value = "searchKey", defaultValue = "") String searchKey, @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) { - // 查询条件初始化 - Supplier supplier = new Supplier(); - BeanUtils.copyProperties(supplierSearchParam, supplier); - - // 查询 - Page supplierPage = supplierService.getPage(supplier,pageNo,pageSize); - // 定义【入库单据分页列表DTO】的分页，传入【页码】、【行数】、及上面分页的【总数】 - Page returnPage = - new Page<>(supplierPage.getCurrent(), supplierPage.getSize(), supplierPage.getTotal()); -// supplierPage -// supplierPage.map(item -> { -// SupplierDto supplierDto = new SupplierDto(); -// BeanUtils.copyProperties(item, supplierDto); // 使用 BeanUtils 复制属性 -// // 如果有特殊字段需要手动转换，可以在这里处理 -// return supplierDto; -// }); - - return R.ok(returnPage); + // 构建查询条件 + QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(supplierSearchParam, + searchKey, new HashSet<>(Arrays.asList("bus_no", "name", "py_str", "wb_str")), request); + // 设置排序 + queryWrapper.orderByAsc("bus_no"); + // 分页查询 + Page supplierPage = + HisPageUtils.selectPage(supplierMapper, queryWrapper, pageNo, pageSize, SupplierDto.class); + // 返回【病种目录列表DTO】分页 + return R.ok(supplierPage); } /** * 添加供应商信息 * - * @param supplierDto 供应商信息 + * @param supplierUpDto 供应商信息 */ @PostMapping("/add-supplier") - public R addSupplyRequest(@Validated @RequestBody SupplierDto supplierDto) { - // 初始化参数 - Supplier supplier = new Supplier(); - BeanUtils.copyProperties(supplierDto, supplier); - // 如果业务上不需要其它处理 直接调用service的保存方法 - boolean saveSupplierSuccess = supplierService.save(supplier); + public R addSupplyRequest(@Validated @RequestBody SupplierUpDto supplierUpDto) { - if (!saveSupplierSuccess) { - return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006, null)); - } - - return saveSupplierSuccess - ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[] {"厂商/供应商信息"})) - : R.fail(PromptMsgConstant.Common.M00007, null); + Supplier supplierInfo = new Supplier(); + BeanUtils.copyProperties(supplierUpDto, supplierInfo); + return supplierService.addSupplier(supplierInfo) + ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"厂商/供应商信息"})) + : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null)); } /** * 编辑供应商信息 * - * @param supplierDto 供应商信息 + * @param supplierUpDto 供应商信息 */ @PutMapping("/edit-supplier") - public R editSupplyRequest(@Validated @RequestBody SupplierDto supplierDto) { - // 初始化参数 - Supplier supplier = new Supplier(); - BeanUtils.copyProperties(supplierDto, supplier); + public R editSupplyRequest(@Validated @RequestBody SupplierUpDto supplierUpDto) { - return supplierService.updateById(supplier) ? - R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"厂商/供应商信息"})) - : R.fail(PromptMsgConstant.Common.M00007, null); + Supplier supplier = new Supplier(); + BeanUtils.copyProperties(supplierUpDto, supplier); + + // 更新供应商信息信息 + return supplierService.updateById(supplier) + ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"厂商/供应商信息"})) + : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null)); } @@ -120,10 +129,56 @@ public class SupplierManagementController { */ @GetMapping(value = "/get-supplier-detail") public R getSupplierDetail(@RequestParam(name = "id", required = true) String supplierId) { + SupplierDto supplierDto = new SupplierDto(); + // 根据ID查询【供应商信息】 + Supplier supplier = supplierService.getById(supplierId); + BeanUtils.copyProperties(supplier, supplierDto); + return R.ok(supplierDto); + } + /** + * 厂商/产地停用 + * + * @param ids 厂商/产地ID列表 + * @return + */ + @PutMapping("/information-stop") + public R editSupplierStop(@RequestBody List ids) { + List supplierList = new CopyOnWriteArrayList<>(); - // 查询 - Supplier supplierDetail = supplierService.getById(supplierId); - return R.ok(supplierDetail); + // 取得更新值 + for (Long detail : ids) { + Supplier supplier = new Supplier(); + supplier.setId(detail); + supplier.setActiveFlag(0); + supplierList.add(supplier); + } + // 更新厂商/产地信息 + return supplierService.updateBatchById(supplierList) + ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"疾病目录"})) + : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null)); + } + + /** + * 厂商/产地启用 + * + * @param ids 厂商/产地ID列表 + * @return + */ + @PutMapping("/information-start") + public R editSupplierStart(@RequestBody List ids) { + List supplierList = new CopyOnWriteArrayList<>(); + + // 取得更新值 + for (Long detail : ids) { + Supplier supplier = new Supplier(); + supplier.setId(detail); + supplier.setActiveFlag(1); + supplierList.add(supplier); + } + // 更新厂商/产地信息 + return supplierService.updateBatchById(supplierList) + ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"疾病目录"})) + : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null)); } } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java index f57eff9e..89c11304 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java @@ -5,6 +5,8 @@ package com.openhis.web.datadictionary.dto; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; @@ -22,6 +24,7 @@ import java.util.Date; public class SupplierDto { /** ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** 编号 */ @@ -52,5 +55,6 @@ public class SupplierDto { private Integer activeFlag; /** 机构编号 */ + @JsonSerialize(using = ToStringSerializer.class) private Long orgId; } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierInitDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierInitDto.java new file mode 100644 index 00000000..b6957a7f --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierInitDto.java @@ -0,0 +1,33 @@ +package com.openhis.web.datadictionary.dto; + +import java.util.ArrayList; +import java.util.List; + +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 厂商/产地初始dto + * + * @author dh + * @date 2025-02-28 + */ +@Data +@Accessors(chain = true) +public class SupplierInitDto { + private List supplierTypeOptions; + + /** + * 状态 + */ + @Data + public static class supplierTypeOption { + private Integer value; + private String info; + + public supplierTypeOption(Integer value, String info) { + this.value = value; + this.info = info; + } + } +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java index 71fe59ec..65f1b91a 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java @@ -24,16 +24,11 @@ public class SupplierSearchParam implements Serializable { */ @Schema(description = "编号") private String busNo; - /** - * 名称* - */ - @Schema(description = "名称") - private String name; /** * 名称* */ @Schema(description = "供应商类型") - private String typeEnum; + private Integer typeEnum; } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierUpDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierUpDto.java new file mode 100644 index 00000000..f7035121 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierUpDto.java @@ -0,0 +1,71 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.datadictionary.dto; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import lombok.experimental.Accessors; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 供应商保存dto + * + * @author dh + * @date 2025-02-24 + */ +@Data +@Accessors(chain = true) +public class SupplierUpDto { + + /** ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** 编号 */ + @NotBlank(message = "编号不能为空") + private String busNo; + + /** 名称 */ + @NotBlank(message = "名称不能为空") + private String name; + + /** 类型 */ + @NotNull(message = "类型不能为空") + private Integer typeEnum; + + /** 地址 */ + @NotBlank(message = "地址不能为空") + private String address; + + /** 拼音码 */ + @NotBlank(message = "拼音码不能为空") + private String pyStr; + + /** 五笔码 */ + @NotBlank(message = "五笔码不能为空") + private String wbStr; + + /** 联系人电话 */ + @NotBlank(message = "联系人电话不能为空") + private String phone; + + /** 联系人邮箱 */ + @NotBlank(message = "联系人邮箱不能为空") + private String email; + + /** 活动标识 */ + private Integer activeFlag; + + /** 机构编号 */ + @JsonSerialize(using = ToStringSerializer.class) + private Long orgId; +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/ISupplierService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/ISupplierService.java index 4291d475..52d2f9aa 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/ISupplierService.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/ISupplierService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.core.common.core.domain.R; import com.openhis.administration.domain.Supplier; +import com.openhis.clinical.domain.ConditionDefinition; import com.openhis.workflow.domain.SupplyRequest; import org.springframework.web.bind.annotation.RequestParam; @@ -17,15 +18,10 @@ import javax.servlet.http.HttpServletRequest; */ public interface ISupplierService extends IService { /** - * 查询厂商/供应商分页列表 + * 新增供应商 * - * @param supplier 查询条件 - * @param pageNo 查询条件 - * @param pageSize 查询条件 - * @return 供应申请列表 + * @param supplier 病种目录实体 + * @return */ - Page getPage(Supplier supplier, Integer pageNo, Integer pageSize); - - - + boolean addSupplier(Supplier supplier); } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java index 6b5447d3..136dcb90 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.utils.StringUtils; import com.core.common.utils.bean.BeanUtils; +import com.openhis.clinical.domain.ConditionDefinition; +import com.openhis.clinical.mapper.ConditionDefinitionMapper; import com.openhis.common.enums.DelFlag; import com.openhis.workflow.domain.SupplyRequest; import lombok.AllArgsConstructor; @@ -14,6 +16,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.administration.domain.Supplier; import com.openhis.administration.mapper.SupplierMapper; import com.openhis.administration.service.ISupplierService; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; /** * 供应商管理Service业务层处理 @@ -25,43 +30,28 @@ import com.openhis.administration.service.ISupplierService; @Service @AllArgsConstructor public class SupplierServiceImpl extends ServiceImpl implements ISupplierService { - private final SupplierMapper supplierMapper; /** - * 查询厂商/产地列表 + * 新增供应商 * - * @param supplier 查询条件 - * @param pageNo 查询条件 - * @param pageSize 查询条件 - * @return 厂商/产地列表 + * @param supplier 厂商/产地实体 + * @return */ @Override - public Page getPage(Supplier supplier, Integer pageNo, Integer pageSize) { - Page supplierList = new Page<>(); -// // 判断入库数量 -// if (supplyRequest.getItemQuantity() != 0) { -// // 查询供应申请信息列表 -// supplyRequestList = supplyRequestMapper.selectPage(new Page<>(pageNo, pageSize), -// new LambdaQueryWrapper().eq(SupplyRequest::getDeleteFlag, DelFlag.NO.getValue())); -// } else { -// return null; -// } - - // 设置查询条件 - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(supplier.getBusNo())) { - lambdaQueryWrapper.eq(Supplier::getBusNo, supplier.getBusNo()); + @Transactional(rollbackFor = Exception.class) + public boolean addSupplier(Supplier supplier) { + // 根据病种编码判断病种是否存在 + List suppliers = + supplierMapper.selectList(new LambdaQueryWrapper() + .eq(Supplier::getBusNo, supplier.getBusNo())); + if (suppliers.size() > 0) { + return false; } - if (StringUtils.isNotEmpty(supplier.getName())) { - lambdaQueryWrapper.eq(Supplier::getName, supplier.getName()); + // 新增供应商 + int insert = supplierMapper.insert(supplier); + if (insert != 1) { + return false; } - if (StringUtils.isNotNull(supplier.getTypeEnum())) { - lambdaQueryWrapper.eq(Supplier::getTypeEnum, supplier.getTypeEnum()); - } - lambdaQueryWrapper.eq(Supplier::getDeleteFlag, DelFlag.NO.getValue()); - - supplierList = supplierMapper.selectPage(new Page<>(pageNo, pageSize), lambdaQueryWrapper); - // 返回入库信息列表 - return supplierList; + return true; } } \ No newline at end of file