质检bug

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

@@ -57,13 +57,13 @@ public class StorageQualitycheckController {
             @ApiImplicitParam(name = "checkResult", value = "检查结果", paramType = "query"),
             @ApiImplicitParam(name = "quality", value = "储粮性质", paramType = "query"),
             @ApiImplicitParam(name = "subType", value = "粮食品种", paramType = "query"),
-            @ApiImplicitParam(name = "checkTime", value = "检查日期", paramType = "query"),
-            @ApiImplicitParam(name = "flagType", value = "判断是否已验收", paramType = "query"),
+            @ApiImplicitParam(name = "searchStartDate", value = "开始日期", paramType = "query"),
+            @ApiImplicitParam(name = "searchEndDate", value = "结束日期", paramType = "query"),
             @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
     })
     public PageInfo<StorageQualitycheck> listPage(Integer pageNum, Integer pageSize,
-                                                  StorageQualitycheck qualitycheck, String checktype, String checkResult, Integer flagType,
-                                                  String quality, Integer subType, String checkTime, Integer orgId) {
+                                                  StorageQualitycheck qualitycheck, String checktype, String checkResult,
+                                                  String quality, Integer subType, String searchStartDate, String searchEndDate, Integer orgId) {
     	StorageQualitycheck qualityCheck = new StorageQualitycheck();
         //根据后台传来的参数进行查找相应类型的类别0:初检 1：验收 2：质量普查 3：出库
         if (StringUtils.isNotBlank(checktype)){
@@ -75,9 +75,12 @@ public class StorageQualitycheckController {
         if (subType!= null){
             qualityCheck.setSubType(subType);
         }
-        if (checkTime!= null){
-            qualityCheck.setCheckTime(ParameterUtil.string2datetime(checkTime));
+
+        if(ParameterUtil.isnotnull(searchStartDate) && ParameterUtil.isnotnull(searchEndDate)){
+            qualityCheck.setSearchStartDate(searchStartDate);
+            qualityCheck.setSearchEndDate(searchEndDate);
         }
+
         // 仓房id.
         if (qualitycheck.getHouseId() != null) {
             qualityCheck.setHouseId(qualitycheck.getHouseId());
@@ -108,9 +111,9 @@ public class StorageQualitycheckController {
         }
 
         //验收结果
-        if (qualitycheck.getFlagType() != null) {
-            qualityCheck.setFlagType(flagType);
-        }
+//        if (qualitycheck.getFlagType() != null) {
+//            qualityCheck.setFlagType(flagType);
+//        }
 
         qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
         //查询出未封仓的质量管理信息 封仓状态：0:未封仓,1:已封仓

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

@@ -1978,8 +1978,11 @@
       <if test="subType !=null">
         and sqk.sub_type = #{subType}
       </if>
-      <if test="checkTime !=null">
-        and sqk.check_time = #{checkTime}
+      <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>
     order by sqk.id desc

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

@@ -5,6 +5,27 @@ import java.math.BigDecimal;
 
 
 public class StorageQualitycheck {
+
+    //开始日期和结束日期
+    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;
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column storage_qualitycheck.id