添加盘点单盘点人接口

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

@@ -102,4 +102,15 @@ public class InvoicingPddApi {
             return Result.error(result.get("message").toString());
         }
     }
+
+
+    @ApiOperation(value = "盘点单-查询盘点人列表", notes = "盘点单-查询盘点人列表")
+    @GetMapping(value = "/queryPddStartByList")
+    public Result<List<Map<String,String>>> queryPddStartByList(InvoicingPddInfoEntity invoicingPddInfoEntity) {
+        if(StringUtils.isBlank(invoicingPddInfoEntity.getNuId())){
+            return Result.error("参数错误，请选择库房");
+        }
+        List<Map<String,String>> pageList = pddApi.queryPddStartByList(invoicingPddInfoEntity);
+        return Result.OK(pageList);
+    }
 }

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

@@ -92,7 +92,7 @@ public class ShiroConfig {
 
         filterChainDefinitionMap.put("/api/tplink/videoStorage/**", "anon"); //视频缓存存储接口
         filterChainDefinitionMap.put("/api/pad/invoicing/getShareInfoByCgdId", "anon"); //查询采购单信息（分享接口使用）
-//        filterChainDefinitionMap.put("/api/pad/invoicing/pdd/**", "anon"); //查询采购单信息（分享接口使用）
+//        filterChainDefinitionMap.put("/api/pad/invoicing/pdd/**", "anon"); //查询盘点单
 //        filterChainDefinitionMap.put("/api/pad/invoicing/**", "anon"); //测试进销存对应的接口
 //        filterChainDefinitionMap.put("/api/pad/qingling/**", "anon"); //测试请领对应的接口
         filterChainDefinitionMap.put("/iot/tq/api/electricityMeter/**", "anon"); //电表回调

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

@@ -18,4 +18,6 @@ public interface IPddApi {
     Map<String, Object> editPddInfo(InvoicingPddInfoEntity invoicingPddInfoEntity);
 
     Map<String, Object> submitPddMain(InvoicingPddMainEntity invoicingPddMainEntity);
+
+    List<Map<String,String>> queryPddStartByList(InvoicingPddInfoEntity invoicingPddInfoEntity);
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/NuInvoicingPddInfoMapper.java

@@ -2,6 +2,7 @@ package com.nu.modules.pdd.mapper;
 
 import java.util.List;
 
+import com.nu.entity.InvoicingPddInfoEntity;
 import org.apache.ibatis.annotations.Param;
 import com.nu.modules.pdd.entity.NuInvoicingPddInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -17,4 +18,6 @@ public interface NuInvoicingPddInfoMapper extends BaseMapper<NuInvoicingPddInfo>
     void addPddInfo(@Param("nuId") String nuId,@Param("createBy") String createBy,@Param("pddId") String pddId);
 
     List<NuInvoicingPddInfo> selectPydPkdList(@Param("pddId")String pddId);
+
+    List<NuInvoicingPddInfo> queryPddStartByList(@Param("params") InvoicingPddInfoEntity invoicingPddInfoEntity);
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddInfoMapper.xml

@@ -29,4 +29,7 @@
     <select id="selectPydPkdList" resultType="com.nu.modules.pdd.entity.NuInvoicingPddInfo">
         select pd_type,count(*) as num from nu_invoicing_pdd_info where pdd_id = #{pddId}  GROUP BY pd_type
     </select>
+    <select id="queryPddStartByList" resultType="com.nu.modules.pdd.entity.NuInvoicingPddInfo">
+        select pdd_start_by as create_by from nu_invoicing_pdd_main where nu_id = #{params.nuId}  GROUP BY pdd_start_by
+    </select>
 </mapper>

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/service/impl/NuInvoicingPddMainServiceImpl.java

@@ -32,10 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Description: 进销存-盘点单主表
@@ -64,6 +61,9 @@ public class NuInvoicingPddMainServiceImpl extends ServiceImpl<NuInvoicingPddMai
         QueryWrapper<NuInvoicingPddMain> queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingPddMain, req.getParameterMap(), customeRuleMap);
         queryWrapper.ge(StringUtils.isNotEmpty(invoicingPddMainEntity.getStartTime()),"create_time",invoicingPddMainEntity.getStartTime());
         queryWrapper.le(StringUtils.isNotEmpty(invoicingPddMainEntity.getEndTime()),"create_time",invoicingPddMainEntity.getEndTime());
+        if(StringUtils.isNotBlank(invoicingPddMainEntity.getPddInfo())){
+            queryWrapper.apply("(pdd_no like ","%"+invoicingPddMainEntity.getPddInfo()+"%"," or pdd_start_by like %"+invoicingPddMainEntity.getPddInfo()+"%)" );
+        }
         if(StringUtils.equals("1",invoicingPddMainEntity.getPydOrPkd())){
             queryWrapper.gt("pyd_num",0);
         }else if (StringUtils.equals("2",invoicingPddMainEntity.getPydOrPkd())){
@@ -220,4 +220,16 @@ public class NuInvoicingPddMainServiceImpl extends ServiceImpl<NuInvoicingPddMai
         map.put("message","操作成功");
         return map;
     }
+
+    @Override
+    public List<Map<String,String>> queryPddStartByList(InvoicingPddInfoEntity invoicingPddInfoEntity) {
+        List<NuInvoicingPddInfo> list = pddInfoMapper.queryPddStartByList(invoicingPddInfoEntity);
+        List<Map<String,String>> list1 = new ArrayList<>();
+        for(NuInvoicingPddInfo param : list){
+            Map<String,String> map = new HashMap<>();
+            map.put("name",param.getCreateBy());
+            list1.add(map);
+        }
+        return list1;
+    }
 }