仓储管理添加查询条件

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

@@ -90,11 +90,6 @@ public class StorageDumpController {
 			criteria.andXLsxzEqualTo(xlsxz);
 		}
 
-		/* 变动后粮食性质 */
-		if (null != xlsxz) {
-			criteria.andXLsxzEqualTo(xlsxz);
-		}
-
 		if (null != startTime && !"".equals(startTime)) {
 			Date starDate = ParameterUtil.string2datetime(startTime + " 00:00:00");
 			criteria.andBusinessCreateTimeGreaterThanOrEqualTo(starDate);

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

@@ -117,7 +117,7 @@ public class StorageOverheadSetController {
 		return modelMap;
 	}
 	@SuppressWarnings({ "null", "unused" })
-	@RequestMapping(value = "/findHwxz",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+	@RequestMapping(value = "/findHwxz",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.POST)
 	@ApiOperation(value="查询架空期设置数据详情", notes = "查询架空期设置数据详情")
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "hwxz", value = "粮食性质", paramType = "query")

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

@@ -1909,6 +1909,9 @@
       <if test="type !=null">
         and sqk.type = #{type}
       </if>
+      <if test="subType !=null">
+        and sqk.sub_type = #{subType}
+      </if>
       <if test="subTypeDetailed !=null">
         and sqk.sub_type_detailed = #{subTypeDetailed}
       </if>
@@ -1930,6 +1933,12 @@
       <if test="checkResult !=null">
         and sqk.check_result = #{checkResult}
       </if>
+      <if test="searchStartDate !=null">
+        and STR_TO_DATE(sqk.check_time, '%Y-%m-%d')  <![CDATA[ >= ]]> #{searchStartDate}
+      </if>
+      <if test="searchEndDate !=null">
+        and STR_TO_DATE(sqk.check_time, '%Y-%m-%d')  &lt;= #{searchEndDate}
+      </if>
    </where>
   <!--   group by sfo.id-->
     order by sqk.id desc