添加接口

nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java

@@ -431,7 +431,6 @@ public class InvoicingApi {
     }
 
 
-
     @ApiOperation(value = "查询采购单信息（主要用于分享接口）", notes = "查询采购单信息（主要用于分享接口）")
     @GetMapping(value = "/getShareInfoByCgdId")
     public Result<Map<String, Object>> getShareInfoByCgdId(CgdMainEntity cgdMainEntityDto) {
@@ -442,6 +441,28 @@ public class InvoicingApi {
         return Result.OK(pageList);
     }
 
+    @ApiOperation(value = "查询采购单列表信息（主要用于小程序接口）", notes = "查询采购单列表信息（主要用于小程序接口）")
+    @GetMapping(value = "/getCgdListByGysId")
+    public Result<IPage<CgdMainEntity>> getCgdListByGysId(CgdMainEntity cgdMainEntityDto,
+                                                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                            HttpServletRequest req) {
+        if(StringUtils.isEmpty(cgdMainEntityDto.getGysId())){
+            return Result.error("采购单错误");
+        }
+        IPage<CgdMainEntity> pageList = invoicingApi.getCgdListByGysId(pageNo, pageSize, cgdMainEntityDto,req);
+        return Result.OK(pageList);
+    }
+    @ApiOperation(value = "查询采购单信息（主要用于小程序接口）", notes = "查询采购单信息（主要用于小程序接口）")
+    @GetMapping(value = "/getCgdInfoByCgdId")
+    public Result<Map<String, Object>> getCgdInfoByCgdId(CgdMainEntity cgdMainEntityDto) {
+        if(StringUtils.isEmpty(cgdMainEntityDto.getId())){
+            return Result.error("采购单错误");
+        }
+        Map<String, Object> pageList = invoicingApi.getCgdInfoByCgdId(cgdMainEntityDto);
+        return Result.OK(pageList);
+    }
+
     @ApiOperation(value = "采购单-查询预警物料信息-分页列表查询", notes = "采购单-查询预警物料信息-分页列表查询")
     @GetMapping(value = "/queryCgdWaringList")
     public Result<IPage<MaterialInfoEntity>> queryCgdWaringList(MaterialInfoEntity materialInfoEntityDto,

nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -92,6 +92,8 @@ public class ShiroConfig {
 
         filterChainDefinitionMap.put("/api/tplink/videoStorage/**", "anon"); //视频缓存存储接口
         filterChainDefinitionMap.put("/api/pad/invoicing/getShareInfoByCgdId", "anon"); //查询采购单信息（分享接口使用）
+        filterChainDefinitionMap.put("/api/pad/invoicing/getCgdListByGysId", "anon"); //查询采购单列表信息（小程序使用）
+        filterChainDefinitionMap.put("/api/pad/invoicing/getCgdInfoByCgdId", "anon"); //查询采购单列表详细信息（小程序使用）
 //        filterChainDefinitionMap.put("/api/pad/invoicing/pdd/**", "anon"); //查询盘点单
 //        filterChainDefinitionMap.put("/api/employessInfo/**", "anon"); //测试员工接口
 //        filterChainDefinitionMap.put("/api/pad/invoicing/**", "anon"); //测试进销存对应的接口

nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java

@@ -58,6 +58,7 @@ public class CgdMainEntity implements Serializable {
 	/**付款方式*/
     private String gysFkfs;
 	/**状态 0:待采购  1：采购中  2采购完成 3作废*/
+    @Dict(dicCode = "cgd_status")
     private String status;
 	/**采购单类型 0采购单 1挂帐单 2结账单 9作废*/
     @Dict(dicCode = "cgd_type")
@@ -117,4 +118,5 @@ public class CgdMainEntity implements Serializable {
     private String nuId;
     private String sysOrgCode;
     private String izNew;
+    private String departName;
 }

nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java

@@ -91,4 +91,8 @@ public interface IInvoicingApi {
     Map<String, Object> queryCrkInfoNumList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity crkInfoEntity, HttpServletRequest req);
 
     Map<String, Object> queryPddStartInfo(Object o);
+
+    IPage<CgdMainEntity> getCgdListByGysId(Integer pageNo, Integer pageSize, CgdMainEntity cgdMainEntityDto, HttpServletRequest req);
+
+    Map<String, Object> getCgdInfoByCgdId(CgdMainEntity cgdMainEntityDto);
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java

@@ -249,5 +249,7 @@ public class NuInvoicingCgdMain implements Serializable {
     private String crksl;
     @TableField(exist = false)
     private BigDecimal xiaoJi;
+    @TableField(exist = false)
+    private String departName;
 
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java

@@ -37,6 +37,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryRuleEnum;
 import org.jeecg.common.system.vo.LoginUser;
@@ -115,6 +116,9 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
     @Autowired
     private IDirectiveOrderApi directiveOrderApi;
 
+    @Autowired
+    private ISysBaseAPI sysBaseAPI;
+
     @Override
     public void rukuInfo(NuInvoicingCgdMain nuInvoicingCgdMain) {
     }
@@ -1451,4 +1455,39 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         return pddApi.queryPddStartInfo(null);
     }
 
+    @Override
+    public IPage<CgdMainEntity> getCgdListByGysId(Integer pageNo, Integer pageSize, CgdMainEntity cgdMainEntityDto, HttpServletRequest req) {
+        JSONObject deptInfo = sysBaseAPI.getDeptInfo();
+        String departName = deptInfo.getString("name");
+        QueryWrapper<NuInvoicingCgdMain> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("gys_id",cgdMainEntityDto.getGysId());
+        queryWrapper.ne("cgd_type","9");
+        queryWrapper.orderByDesc("create_time");
+        Page<NuInvoicingCgdMain> page = new Page<>(pageNo, pageSize);
+        List<NuInvoicingCgdMain> list = baseMapper.selectList(page,queryWrapper);
+        list.forEach(item->{
+            item.setDepartName(departName);
+        });
+        IPage<CgdMainEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
+        entityPage.setRecords(BeanUtil.copyToList(list, CgdMainEntity.class));
+        return entityPage;
+    }
+
+    @Override
+    public Map<String, Object> getCgdInfoByCgdId(CgdMainEntity cgdMainEntityDto) {
+        JSONObject deptInfo = sysBaseAPI.getDeptInfo();
+        String departName = deptInfo.getString("name");
+        NuInvoicingCgdMain cgdMain = baseMapper.selectById(cgdMainEntityDto.getId());
+        List<NuInvoicingCgdInfo> list = cgdInfoMapper.selectList(new QueryWrapper<NuInvoicingCgdInfo>().eq("cgd_id",cgdMain.getId()));
+        Map<String, Object> map = new HashMap<>();
+        map.put("cgdNo",cgdMain.getCgdNo());
+        map.put("qgDate",cgdMain.getQgDate());
+        map.put("status_dictText",dictUtils.translateDictValue("cgd_status",cgdMain.getStatus()));
+        map.put("departName",departName);
+        map.put("qgBy",cgdMain.getQgBy());
+        map.put("createBy",cgdMain.getCreateBy());
+        map.put("list", list);
+        return map;
+    }
+
 }