粮库决策查询添加

src/main/java/com/chinaitop/depot/supervise/controller/CcZyController.java

@@ -48,16 +48,24 @@ public class CcZyController {
             @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
             @ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "query"),
+            @ApiImplicitParam(name = "houseCode", value = "仓房Code", paramType = "query"),
+            @ApiImplicitParam(name = "homeworkType", value = "作业类型", paramType = "query"),
             @ApiImplicitParam(name = "startDate", value = "作业开始时间", paramType = "query"),
             @ApiImplicitParam(name = "endDate", value = "作业结束时间", paramType = "query")
     })
-    public PageInfo<Map<String,Object>> getCcZyList(Integer pageNum, Integer pageSize,Integer houseId,String startDate,String endDate){
+    public PageInfo<Map<String,Object>> getCcZyList(Integer pageNum, Integer pageSize,Integer houseId,String houseCode,String homeworkType,String startDate,String endDate){
 
         Map<String,Object> map = new HashMap<>();
 
         if(ParameterUtil.isnotnull(houseId)){
             map.put("houseId",houseId);
         }
+        if(ParameterUtil.isnotnull(houseCode)){
+            map.put("houseCode",houseCode);
+        }
+        if(ParameterUtil.isnotnull(homeworkType)){
+            map.put("homeworkType",homeworkType);
+        }
         if(ParameterUtil.isnotnull(startDate)){
             map.put("startTime",startDate);
         }

src/main/java/com/chinaitop/depot/supervise/mapper/CcZyMapper.xml

@@ -15,8 +15,8 @@
 	LEFT JOIN t_job_application tja ON tf.aeration_plan_number = tja.areation_plan_number
 	WHERE
 		tf.task_start_time IS NOT NULL
-      <if test="houseId != null">
-          and tf.house_id = #{houseId,jdbcType=INTEGER}
+      <if test="houseCode != null">
+          and tja.v_cf_code = #{houseCode,jdbcType=INTEGER}
       </if>
       <if test="startTime != null">
           and tf.task_start_time &gt;= #{startTime,jdbcType=TIMESTAMP}
@@ -24,6 +24,9 @@
       <if test="endTime != null">
           and tf.task_end_time &lt;= #{endTime,jdbcType=TIMESTAMP}
       </if>
+      <if test="homeworkType != null">
+          and 1 = #{homeworkType,jdbcType=VARCHAR}
+      </if>
     UNION ALL
         SELECT
 			xz.id,
@@ -37,7 +40,7 @@
 			t_fumigation_plan xz
 		LEFT JOIN t_fumigation_process tfp ON xz.id = tfp.fumigation_id
 		WHERE
-			xz.updatetime IS NOT NULL and xz.state=5
+			xz.updatetime IS NOT NULL and xz.state=6
       <if test="houseId != null">
           AND xz.house_id = #{houseId,jdbcType=INTEGER}
       </if>
@@ -47,6 +50,9 @@
       <if test="endTime != null">
           AND tfp.task_end_time &lt;= #{endTime,jdbcType=TIMESTAMP}
       </if>
+      <if test="homeworkType != null">
+          and 2 = #{homeworkType,jdbcType=VARCHAR}
+      </if>
   </select>
   <select id="selectById" parameterType="java.lang.Integer" resultType="java.util.HashMap">
     SELECT