wangjunping/his
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

厂商更新 up by dh

Browse Source
This commit is contained in:
duhe
2025-03-04 09:55:41 +08:00
parent a430f9157e
commit 7e597d677c
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java
View File

@@ -19,7 +19,9 @@ import com.openhis.administration.domain.Supplier;
import com.openhis.administration.mapper.SupplierMapper; import com.openhis.administration.mapper.SupplierMapper;
import com.openhis.administration.service.ISupplierService; import com.openhis.administration.service.ISupplierService;
import com.openhis.common.constant.PromptMsgConstant; import com.openhis.common.constant.PromptMsgConstant;
import com.openhis.common.enums.AccountStatus;
import com.openhis.common.enums.SupplierType; import com.openhis.common.enums.SupplierType;
import com.openhis.common.utils.EnumUtils;
import com.openhis.common.utils.HisPageUtils; import com.openhis.common.utils.HisPageUtils;
import com.openhis.common.utils.HisQueryUtils; import com.openhis.common.utils.HisQueryUtils;
import com.openhis.web.datadictionary.dto.*; import com.openhis.web.datadictionary.dto.*;
@@ -84,6 +86,10 @@ public class SupplierManagementController {
// 分页查询 // 分页查询
Page<SupplierDto> supplierPage = Page<SupplierDto> supplierPage =
HisPageUtils.selectPage(supplierMapper, queryWrapper, pageNo, pageSize, SupplierDto.class); HisPageUtils.selectPage(supplierMapper, queryWrapper, pageNo, pageSize, SupplierDto.class);
// 枚举类回显赋值
supplierPage.getRecords().forEach(e ->
e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag()))
);
// 返回【病种目录列表DTO】分页 // 返回【病种目录列表DTO】分页
return R.ok(supplierPage); return R.ok(supplierPage);
} }
@@ -124,14 +130,14 @@ public class SupplierManagementController {
/** /**
* 厂商/产地详细查询 * 厂商/产地详细查询
* *
* @param supplierId 查询条件 * @param id 查询条件
* @return 厂商/产地查询结果 * @return 厂商/产地查询结果
*/ */
@GetMapping(value = "/get-supplier-detail") @GetMapping(value = "/get-supplier-detail/{id}")
public R<?> getSupplierDetail(@RequestParam(name = "id", required = true) String supplierId) { public R<?> getSupplierDetail(@PathVariable("id") Long id) {
SupplierDto supplierDto = new SupplierDto(); SupplierDto supplierDto = new SupplierDto();
// 根据ID查询【供应商信息】 // 根据ID查询【供应商信息】
Supplier supplier = supplierService.getById(supplierId); Supplier supplier = supplierService.getById(id);
BeanUtils.copyProperties(supplier, supplierDto); BeanUtils.copyProperties(supplier, supplierDto);
return R.ok(supplierDto); return R.ok(supplierDto);
} }

1
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java
View File

@@ -53,6 +53,7 @@ public class SupplierDto {
/** 活动标识 */ /** 活动标识 */
private Integer activeFlag; private Integer activeFlag;
private String activeFlag_enumText;
/** 机构编号 */ /** 机构编号 */
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)