diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java index 6eccc6a7..f2883a62 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java @@ -68,6 +68,17 @@ public class InvoicingApi { return Result.OK(list); } + @ApiOperation(value = "查询采购单列表信息", notes = "查询采购单列表信息") + @AutoLog(value = "查询采购单列表信息") + @GetMapping(value = "/queryCgdList") + public Result> queryCgdList(CgdMainEntity cgdMainEntityDto, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + IPage pageList = invoicingApi.queryCgdList(pageNo, pageSize, cgdMainEntityDto,req); + return Result.OK(pageList); + } + @ApiOperation(value = "查询采购单详细信息", notes = "查询采购单详细信息") @AutoLog(value = "查询采购单详细信息") @GetMapping(value = "/queryCgdInfoList") diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java index f3747011..0325bf53 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java @@ -6,6 +6,7 @@ import org.jeecg.common.aspect.annotation.Dict; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -22,6 +23,7 @@ public class CgdMainEntity implements Serializable { /**id*/ private String id; /**createBy*/ + @Dict(dicCode = "username", dictTable = "sys_user",dicText = "realname") private String createBy; /**createTime*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @@ -38,6 +40,7 @@ public class CgdMainEntity implements Serializable { /**采购单单号*/ private String cgdNo; /**供应商id*/ + @Dict(dicCode = "id", dictTable = "nu_config_suppliers_info",dicText = "suppliers_name") private String gysId; /**请购时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @@ -66,6 +69,8 @@ public class CgdMainEntity implements Serializable { private String jzdPath; /**审核人*/ private String reviewedBy; + // 总价 + private BigDecimal totalPrice; /**审核时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") diff --git a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java index 3ddffbf0..703c4681 100644 --- a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java @@ -17,6 +17,8 @@ public interface IInvoicingApi { List generatedPurchaseViewOrder(List infoList); + IPage queryCgdList(Integer pageNo, Integer pageSize, CgdMainEntity cgdMainEntityDto, HttpServletRequest req); + IPage queryCgdInfoList(Integer pageNo, Integer pageSize, CgdInfoEntity cgdInfoEntityDto, HttpServletRequest req); void reviewPurchaseOrder(CgdMainEntity cgdMainEntity); @@ -34,4 +36,5 @@ public interface IInvoicingApi { void deleteQgInfoById(String id); void emptiedQgInfo(); + } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java index fa94cf18..e9377717 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java @@ -128,7 +128,6 @@ public class NuInvoicingCgdMain implements Serializable { /**供应商名称*/ private String gysName; // 总价 - @TableField(exist = false) private BigDecimal totalPrice; @TableField(exist = false) private String qgdId;//临时变量,用于清空购物车id diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java index b8145301..a581da9a 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java @@ -323,6 +323,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl generatedPurchaserder(List cgdMainList) { @@ -358,6 +359,18 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl queryCgdList(Integer pageNo, Integer pageSize, CgdMainEntity cgdMainEntityDto, HttpServletRequest req) { + NuInvoicingCgdMain nuInvoicingCgdMain = new NuInvoicingCgdMain(); + BeanUtils.copyProperties(cgdMainEntityDto,nuInvoicingCgdMain); + Map customeRuleMap = new HashMap<>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingCgdMain, req.getParameterMap(), customeRuleMap); + Page page = new Page<>(pageNo, pageSize); + List list = cgdMainMapper.selectList(page,queryWrapper); + IPage entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); + entityPage.setRecords(BeanUtil.copyToList(list, CgdMainEntity.class)); + return entityPage; + } @Override public IPage queryCgdInfoList(Integer pageNo, Integer pageSize, CgdInfoEntity cgdInfoEntityDto, HttpServletRequest req) {