3

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

@@ -34,21 +34,21 @@ public class VentilationOperationController {
             @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
             @ApiImplicitParam(name = "orgId", value = "库点编码", paramType = "query"),
-            @ApiImplicitParam(name = "vcfcode", value = "仓库名称", paramType = "query")
+            @ApiImplicitParam(name = "cfbh", value = "仓房编号", paramType = "query"),
+            @ApiImplicitParam(name = "createTime", value = "登记时间", paramType = "query"),
+            @ApiImplicitParam(name = "cfmc", value = "仓房ID", paramType = "query"),
+            @ApiImplicitParam(name = "funcType", value = "功能类型(1:作业开始,2:作业结束)", paramType = "query")
     })
-   public ResponseEntity<PageInfo<TVentilationOperation>> getList(Integer pageNum, Integer pageSize, String orgId, String cfbh,String createTime,String cfmc) {
+   public ResponseEntity<PageInfo<TVentilationOperation>> getList(Integer pageNum, Integer pageSize, 
+		   String orgId, String cfbh, String createTime, String cfmc, String funcType) {
         List<TVentilationOperation> list = null;
         try {
-            list = ventilationOperationService.getList(pageNum,pageSize,orgId,cfbh,createTime,cfmc);
+            list = ventilationOperationService.getList(pageNum,pageSize,orgId,cfbh,createTime,cfmc, funcType);
         } catch (Exception e) {
             e.printStackTrace();
             ResponseEntity.failed(e.getMessage());
         }
         PageInfo<TVentilationOperation> pageInfo = new PageInfo<TVentilationOperation>(list);
-        /*if(pageInfo.getList()!=null && pageInfo.getList().size()>0){
-        	pageInfo.setStartRow(pageInfo.getStartRow()+1);
-        	pageInfo.setEndRow(pageInfo.getEndRow()+1);
-        }*/
         return ResponseEntity.ok(pageInfo);
     }
 

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

@@ -6584,6 +6584,11 @@ public class TVentilationOperationExample {
             addCriterion("zfdjmj_zhi not between", value1, value2, "zfdjmjZhi");
             return (Criteria) this;
         }
+
+        public Criteria andDataStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("data_status >=", value, "dataStatus");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/chinaitop/depot/storage/service/VentilationOperationService.java

@@ -6,7 +6,7 @@ import com.chinaitop.depot.storage.model.TVentilationOperation;
 
 public interface VentilationOperationService {
 
-	List<TVentilationOperation> getList(Integer pageNum, Integer pageSize,String orgId, String cfbh,String createTime,String cfmc);
+	List<TVentilationOperation> getList(Integer pageNum, Integer pageSize, String orgId, String cfbh, String createTime, String cfmc, String funcType);
 
 	TVentilationOperation getById(String id);
 

src/main/java/com/chinaitop/depot/storage/service/impl/VentilationOperationServiceImpl.java

@@ -24,7 +24,8 @@ public class VentilationOperationServiceImpl implements VentilationOperationServ
     private TVentilationOperationMapper tVentilationOperationMapper;
 
 	@Override
-	public List<TVentilationOperation> getList(Integer pageNum, Integer pageSize,String orgId, String cfbh,String createTime,String cfmc) {
+	public List<TVentilationOperation> getList(Integer pageNum, Integer pageSize, 
+			String orgId, String cfbh, String createTime, String cfmc, String funcType) {
 		TVentilationOperationExample tVentilationOperationExample = new TVentilationOperationExample();
 		tVentilationOperationExample.setDistinct(true);
 		TVentilationOperationExample.Criteria criteria = tVentilationOperationExample.createCriteria();
@@ -47,6 +48,9 @@ public class VentilationOperationServiceImpl implements VentilationOperationServ
         if (StringUtils.isNotEmpty(orgId)) {
         	criteria.andOrgIdEqualTo(Integer.parseInt(orgId));
         }
+        if ("2".equals(funcType)) {//如果是作业结束，则查询数据状态>=1的数据
+        	criteria.andDataStatusGreaterThanOrEqualTo(1);
+        }
         tVentilationOperationExample.setOrderByClause("djrq desc");
         if (null != pageNum && null != pageSize) {
             PageHelper.startPage(pageNum, pageSize);