添加采购单金额字段

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<IPage<CgdMainEntity>> queryCgdList(CgdMainEntity cgdMainEntityDto,
+                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                         HttpServletRequest req) {
+        IPage<CgdMainEntity> pageList = invoicingApi.queryCgdList(pageNo, pageSize, cgdMainEntityDto,req);
+        return Result.OK(pageList);
+    }
+
     @ApiOperation(value = "查询采购单详细信息", notes = "查询采购单详细信息")
     @AutoLog(value = "查询采购单详细信息")
     @GetMapping(value = "/queryCgdInfoList")

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")

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<CgdMainEntity> generatedPurchaseViewOrder(List<QgdInfoEntity> infoList);
 
+    IPage<CgdMainEntity> queryCgdList(Integer pageNo, Integer pageSize, CgdMainEntity cgdMainEntityDto, HttpServletRequest req);
+
     IPage<CgdInfoEntity> 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();
+
 }

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

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<NuInvoicingCgdMai
 
     }
 
+
     @Override
     public List<CgdMainEntity> generatedPurchaserder(List<CgdMainEntity> cgdMainList) {
 
@@ -358,6 +359,18 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         return cgdMainList;
     }
 
+    @Override
+    public IPage<CgdMainEntity> queryCgdList(Integer pageNo, Integer pageSize, CgdMainEntity cgdMainEntityDto, HttpServletRequest req) {
+        NuInvoicingCgdMain nuInvoicingCgdMain = new NuInvoicingCgdMain();
+        BeanUtils.copyProperties(cgdMainEntityDto,nuInvoicingCgdMain);
+        Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
+        QueryWrapper<NuInvoicingCgdMain> queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingCgdMain, req.getParameterMap(), customeRuleMap);
+        Page<NuInvoicingCgdMain> page = new Page<>(pageNo, pageSize);
+        List<NuInvoicingCgdMain> list = cgdMainMapper.selectList(page,queryWrapper);
+        IPage<CgdMainEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
+        entityPage.setRecords(BeanUtil.copyToList(list, CgdMainEntity.class));
+        return entityPage;
+    }
 
     @Override
     public IPage<CgdInfoEntity> queryCgdInfoList(Integer pageNo, Integer pageSize, CgdInfoEntity cgdInfoEntityDto, HttpServletRequest req) {