查询

src/main/java/com/chinaitop/depot/storage/controller/StorageChangeStoragehouseTaskController.java

@@ -316,9 +316,10 @@ public class StorageChangeStoragehouseTaskController {
 			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
 			@ApiImplicitParam(name = "planStartDateA", value = "计划开始日期A", paramType = "query"),
 			@ApiImplicitParam(name = "planStartDateB", value = "计划开始日期B", paramType = "query"),
+			@ApiImplicitParam(name = "workNo", value = "作业单号", paramType = "query"),
 			@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query") })
 	public PageInfo<StorageChangeStoragehouseTask> getWorkPageInfo(Integer pageNum, Integer pageSize, Integer orgId,
-			String planStartDateA, String planStartDateB) {
+			String planStartDateA, String planStartDateB, String workNo) {
 		StorageChangeStoragehouseTaskExample example = new StorageChangeStoragehouseTaskExample();
 		Criteria Criteria = example.createCriteria();
 		String planType = "ChangeWork";
@@ -333,6 +334,9 @@ public class StorageChangeStoragehouseTaskController {
 			Date starDate = ParameterUtil.string2datetime(planStartDateB + " 23:59:59");
 			Criteria.andPlanStartDateLessThanOrEqualTo(starDate);
 		}
+		if (workNo != null && !"".equals(workNo)) {
+			Criteria.andWorkNoEqualTo(workNo);
+		}
 		if (orgId != null && !"".equals(orgId)) {
 			Criteria.andOrgIdEqualTo(orgId);
 		}

src/main/java/com/chinaitop/depot/storage/controller/StorageDumpController.java

@@ -52,6 +52,7 @@ public class StorageDumpController {
 			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
 			@ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "query"),
 			@ApiImplicitParam(name = "wareId", value = "货位ID", paramType = "query"),
+			@ApiImplicitParam(name = "subType", value = "粮食品种", paramType = "query"),
 			@ApiImplicitParam(name = "ylsxz", value = "原粮食性质", paramType = "query"),
 			@ApiImplicitParam(name = "xlsxz", value = "转储后性质", paramType = "query"),
 			@ApiImplicitParam(name = "startTime", value = "业务发生起始时间", paramType = "query"),
@@ -59,7 +60,7 @@ public class StorageDumpController {
 			@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
 	})
 	public PageInfo<StorageDump> getList(Integer pageNum, Integer pageSize,
-										Integer houseId, Integer wareId, Integer ylsxz, Integer xlsxz, 
+										Integer houseId, Integer wareId,Integer subType, Integer ylsxz, Integer xlsxz,
 										String startTime, String endTime, Integer orgId) {
 
 		StorageDumpExample example = new StorageDumpExample();
@@ -75,6 +76,10 @@ public class StorageDumpController {
 			criteria.andWareIdEqualTo(wareId);
 		}
 
+		if (subType!= null){
+			criteria.andLspzEqualTo(subType);
+		}
+
 		/* 原粮食性质 */
 		if (null != ylsxz) {
 			criteria.andYLsxzEqualTo(ylsxz);

src/main/java/com/chinaitop/depot/storage/controller/StorageFoodbasicInfoController.java

@@ -1,5 +1,6 @@
 package com.chinaitop.depot.storage.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.chinaitop.depot.storage.model.StorageFoodbasicinfo;
 import com.chinaitop.depot.storage.model.StorageFoodbasicinfoExample;
 import com.chinaitop.depot.storage.model.StorageFoodbasicinfoExample.Criteria;
@@ -15,6 +16,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -102,10 +104,19 @@ public class StorageFoodbasicInfoController {
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
             @ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "query"),
             @ApiImplicitParam(name = "warehouseId", value = "货位ID", paramType = "query"),
-            @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
+            @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query"),
+            @ApiImplicitParam(name = "quality", value = "储粮性质", paramType = "query"),
+            @ApiImplicitParam(name = "subType", value = "粮食品种", paramType = "query"),
+            @ApiImplicitParam(name = "sealStatus", value = "封仓状态", paramType = "query"),
+            @ApiImplicitParam(name = "searchStartDate", value = "开始日期", paramType = "query"),
+            @ApiImplicitParam(name = "searchEndDate", value = "结束日期", paramType = "query")
+
+
     })
     public PageInfo<StorageFoodbasicinfo> basicinfoPageInfo(Integer pageNum, Integer pageSize ,
-                                                            Integer houseId, Integer warehouseId ,Integer orgId){
+                                                            Integer houseId, Integer warehouseId ,Integer orgId,
+                                                            String quality, Integer subType,String sealStatus,
+                                                            String searchStartDate, String searchEndDate){
         StorageFoodbasicinfo foodbasicinfo = new StorageFoodbasicinfo();
         if(houseId != null){
             foodbasicinfo.setHouseId(houseId);
@@ -113,6 +124,22 @@ public class StorageFoodbasicInfoController {
         if(warehouseId != null){
             foodbasicinfo.setWarehouseId(warehouseId);
         }
+        if (StringUtils.isNotBlank(quality)){
+            HashMap hashMap = JSON.parseObject(quality, HashMap.class);
+            String ax = String.valueOf(hashMap.get("id"));
+            foodbasicinfo.setQuality(ax);
+        }
+        if (subType!= null){
+            foodbasicinfo.setSubType(subType);
+        }
+
+        if(ParameterUtil.isnotnull(searchStartDate) && ParameterUtil.isnotnull(searchEndDate)){
+            foodbasicinfo.setSearchStartDate(searchStartDate);
+            foodbasicinfo.setSearchEndDate(searchEndDate);
+        }
+        if(ParameterUtil.isnotnull(sealStatus)){
+            foodbasicinfo.setSealStatus(sealStatus);
+        }
         if (pageNum!=null && pageSize!=null) {
             PageHelper.startPage(pageNum, pageSize);
         }

src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckController.java

@@ -292,10 +292,16 @@ public class StorageQualitycheckController {
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
             @ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "query"),
             @ApiImplicitParam(name = "warehouseId", value = "货位ID", paramType = "query"),
-            @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
-    })
+            @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query"),
+            @ApiImplicitParam(name = "quality", value = "储粮性质", paramType = "query"),
+            @ApiImplicitParam(name = "subType", value = "粮食品种", paramType = "query"),
+            @ApiImplicitParam(name = "sealStatus", value = "封仓状态", paramType = "query"),
+            @ApiImplicitParam(name = "searchStartDate", value = "开始日期", paramType = "query"),
+            @ApiImplicitParam(name = "searchEndDate", value = "结束日期", paramType = "query")})
     public PageInfo<StorageQualitycheck> listPage(Integer pageNum, Integer pageSize ,
-                                                  String houseId, String warehouseId, Integer orgId) {
+                                                  String houseId, String warehouseId,Integer orgId,
+                                                  String quality, Integer subType,String sealStatus,
+                                                  String searchStartDate, String searchEndDate) {
     	StorageQualitycheck qualityCheck = new StorageQualitycheck();
         if(StringUtils.isNoneBlank(houseId)){
             qualityCheck.setHouseId(Integer.valueOf(houseId));
@@ -311,7 +317,22 @@ public class StorageQualitycheckController {
         qualityCheck.setType("1");///查找验收质量管理的信息
 
         qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
+        if (StringUtils.isNotBlank(quality)){
+            HashMap hashMap = JSON.parseObject(quality, HashMap.class);
+            String ax = String.valueOf(hashMap.get("id"));
+            qualityCheck.setQuality(ax);
+        }
+        if (subType!= null){
+            qualityCheck.setSubType(subType);
+        }
 
+        if(ParameterUtil.isnotnull(searchStartDate) && ParameterUtil.isnotnull(searchEndDate)){
+            qualityCheck.setSearchStartDate(searchStartDate);
+            qualityCheck.setSearchEndDate(searchEndDate);
+        }
+        if(sealStatus != null && ParameterUtil.isnotnull(sealStatus)){
+            qualityCheck.setSealStatus(sealStatus);
+        }
         if (pageNum!=null && pageSize!=null) {
             PageHelper.startPage(pageNum, pageSize);
         }

src/main/java/com/chinaitop/depot/storage/mapper/StorageFoodbasicinfoMapper.xml

@@ -1034,6 +1034,21 @@
       <if test="warehouseId != null">
         and sfo.warehouse_id = #{warehouseId}
       </if>
+     <if test="sealStatus !=null">
+       and sfo.seal_status = #{sealStatus}
+     </if>
+     <if test="quality !=null">
+       and sfo.quality = #{quality}
+     </if>
+     <if test="subType !=null">
+       and sfo.sub_type = #{subType}
+     </if>
+     <if test="searchStartDate !=null">
+       and STR_TO_DATE(sfo.seal_date, '%Y-%m-%d')  <![CDATA[ >= ]]> #{searchStartDate}
+     </if>
+     <if test="searchEndDate !=null">
+       and STR_TO_DATE(sfo.seal_date, '%Y-%m-%d')  &lt;= #{searchEndDate}
+     </if>
      <if test="orgId != null">
         and sfo.org_id = #{orgId}
       </if>

src/main/java/com/chinaitop/depot/storage/mapper/StorageQualitycheckMapper.xml

@@ -1915,6 +1915,9 @@
       <if test="level !=null">
         and sqk.level = #{level}
       </if>
+      <if test="quality !=null">
+        and sqk.quality = #{quality}
+      </if>
       <if test="historyStatus !=null">
         and sqk.history_status = #{historyStatus}
       </if>

src/main/java/com/chinaitop/depot/storage/model/StorageFoodbasicinfo.java

@@ -4,6 +4,26 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 public class StorageFoodbasicinfo {
+    //开始日期和结束日期
+    private String searchStartDate;
+
+    public String getSearchStartDate() {
+        return searchStartDate;
+    }
+
+    public void setSearchStartDate(String searchStartDate) {
+        this.searchStartDate = searchStartDate;
+    }
+
+    public String getSearchEndDate() {
+        return searchEndDate;
+    }
+
+    public void setSearchEndDate(String searchEndDate) {
+        this.searchEndDate = searchEndDate;
+    }
+
+    private String searchEndDate;
     private Integer id;
     private Date sealDate;//封仓日期
     private BigDecimal deductVolume;//扣除体积