Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

pom.xml

@@ -184,6 +184,9 @@
             <properties>
                 <env>local</env>
             </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
         </profile>
         <profile>
             <id>dev</id>
@@ -202,9 +205,6 @@
             <properties>
                 <env>prod</env>
             </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
         </profile>
     </profiles>
     <build>

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/InOutWarehouseTaskController.java

@@ -126,6 +126,15 @@ public class InOutWarehouseTaskController {
     public InOutWarehouseTask getTask(@RequestParam String id) {
         return inOutWarehouseTaskService.getTask(id);
     }
+    /**
+     * 任务列表
+     * @param inOutWarehouseTask
+     * @return
+     */
+    @GetMapping("/selectWarehouseTask")
+    public Page<InOutWarehouseTask> selectWarehouseTask(InOutWarehouseTask inOutWarehouseTask) {
+        return inOutWarehouseTaskService.selectWarehouseTask(inOutWarehouseTask);
+    }
 
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/InOutWarehouseTask.java

@@ -244,6 +244,11 @@ public class InOutWarehouseTask extends BaseModel<InOutWarehouseTask> {
      */
     @TableField(exist = false)
     private List<InOutWarehouseTask> inOutWarehouseTaskList;
+    /**
+     * 仓库名集合
+     */
+    @TableField(exist = false)
+    private String stringList;
 
     @TableField(exist = false)
     private String taskId;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IInOutWarehouseTaskService.java

@@ -85,4 +85,10 @@ public interface IInOutWarehouseTaskService extends IService<InOutWarehouseTask>
      * @return
      */
     InOutWarehouseTask getTask(String id);
+    /**
+     * 任务列表
+     * @param inOutWarehouseTask
+     * @return
+     */
+    Page<InOutWarehouseTask> selectWarehouseTask(InOutWarehouseTask inOutWarehouseTask);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/InOutWarehouseTaskServiceImpl.java

@@ -443,4 +443,32 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
         InOutWarehouseTask inOutWarehouseTask=this.selectById(id);
         return inOutWarehouseTask;
     }
+
+    @Override
+    public Page<InOutWarehouseTask> selectWarehouseTask(InOutWarehouseTask inOutWarehouseTask) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (inOutWarehouseTask.getCurrentPage() - 1)
+                * inOutWarehouseTask.getPageSize());
+        //公司id
+        pageView.put("compId", inOutWarehouseTask.getCompId());
+        pageView.put("searchKeyWord", inOutWarehouseTask.getSearchKeyWord());
+        pageView.put("searchType", inOutWarehouseTask.getSearchType());
+        pageView.put("pageSize", inOutWarehouseTask.getPageSize());
+        pageView.put("currentPage", inOutWarehouseTask.getCurrentPage());
+        Integer dataCount=0;
+        List<InOutWarehouseTask> dataList=new ArrayList<>();
+        String[] strings = inOutWarehouseTask.getStringList().split(",");
+        for (int i=0;i<strings.length;i++){
+            pageView.put("warehouseName",strings[i]);
+            // 查询出入库任务总数
+            dataCount =dataCount+baseMapper.getCountByCondition(pageView);
+            dataList.addAll(baseMapper.getListByCondition(pageView));
+        }
+        Page<InOutWarehouseTask> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(inOutWarehouseTask.getCurrentPage());
+        page.setSize(inOutWarehouseTask.getPageSize());
+        return page;
+    }
 }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/InOutWarehouseTaskMapper.xml

@@ -23,6 +23,9 @@
                 AND task_status_key = '7'
             </if>
         </if>
+        <if test="warehouseName != null and warehouseName != ''">
+            AND warehouse_name= #{warehouseName}
+        </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(in_out_task_no) like lower(CONCAT('%',#{searchKeyWord},'%')))
@@ -67,6 +70,9 @@
                 AND task_status_key  = '7'
             </if>
         </if>
+        <if test="warehouseName != null and warehouseName != ''">
+            AND warehouse_name= #{warehouseName}
+        </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(in_out_task_no) like lower(CONCAT('%',#{searchKeyWord},'%')))