山西熏蒸优化

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/fumigation/mapper/TFumigationPlanMapper.xml

@@ -117,7 +117,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from t_fumigation_plan
     where id = #{id,jdbcType=VARCHAR}
@@ -133,29 +133,29 @@
     </if>
   </delete>
   <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.intelligent.fumigation.model.TFumigationPlan" >
-    insert into t_fumigation_plan (id, house_id, keeper, 
-      grain_kind, grain_count, grain_storage_time, 
-      fumigation_type, fumigation_number, fumigation_command, 
-      fumigation_operation, fumiagtion_protective, 
-      expected, points_work, note, 
-      state, creater, create_time, 
-      approve_people, approve_department, approve_note, 
-      approve_time, delete_state, org_id, 
-      fumigation_frequency, cgxzfs, hlxzfs, 
-      hlxzynhljsjh, xzfazd, xzfaqcr, 
-      xzfapzr, xzfabbqk, xzfzr, 
+    insert into t_fumigation_plan (id, house_id, keeper,
+      grain_kind, grain_count, grain_storage_time,
+      fumigation_type, fumigation_number, fumigation_command,
+      fumigation_operation, fumiagtion_protective,
+      expected, points_work, note,
+      state, creater, create_time,
+      approve_people, approve_department, approve_note,
+      approve_time, delete_state, org_id,
+      fumigation_frequency, cgxzfs, hlxzfs,
+      hlxzynhljsjh, xzfazd, xzfaqcr,
+      xzfapzr, xzfabbqk, xzfzr,
       hcjcdh, updatetime)
-    values (#{id,jdbcType=VARCHAR}, #{houseId,jdbcType=INTEGER}, #{keeper,jdbcType=INTEGER}, 
+    values (#{id,jdbcType=VARCHAR}, #{houseId,jdbcType=INTEGER}, #{keeper,jdbcType=INTEGER},
       #{grainKind,jdbcType=INTEGER}, #{grainCount,jdbcType=DECIMAL}, #{grainStorageTime,jdbcType=TIMESTAMP},
-      #{fumigationType,jdbcType=INTEGER}, #{fumigationNumber,jdbcType=INTEGER}, #{fumigationCommand,jdbcType=VARCHAR}, 
-      #{fumigationOperation,jdbcType=VARCHAR}, #{fumiagtionProtective,jdbcType=VARCHAR}, 
-      #{expected,jdbcType=VARCHAR}, #{pointsWork,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, 
-      #{state,jdbcType=INTEGER}, #{creater,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{approvePeople,jdbcType=VARCHAR}, #{approveDepartment,jdbcType=VARCHAR}, #{approveNote,jdbcType=VARCHAR}, 
-      #{approveTime,jdbcType=TIMESTAMP}, #{deleteState,jdbcType=VARCHAR}, #{orgId,jdbcType=VARCHAR}, 
-      #{fumigationFrequency,jdbcType=INTEGER}, #{cgxzfs,jdbcType=VARCHAR}, #{hlxzfs,jdbcType=VARCHAR}, 
-      #{hlxzynhljsjh,jdbcType=VARCHAR}, #{xzfazd,jdbcType=VARCHAR}, #{xzfaqcr,jdbcType=VARCHAR}, 
-      #{xzfapzr,jdbcType=VARCHAR}, #{xzfabbqk,jdbcType=VARCHAR}, #{xzfzr,jdbcType=VARCHAR}, 
+      #{fumigationType,jdbcType=INTEGER}, #{fumigationNumber,jdbcType=INTEGER}, #{fumigationCommand,jdbcType=VARCHAR},
+      #{fumigationOperation,jdbcType=VARCHAR}, #{fumiagtionProtective,jdbcType=VARCHAR},
+      #{expected,jdbcType=VARCHAR}, #{pointsWork,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR},
+      #{state,jdbcType=INTEGER}, #{creater,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+      #{approvePeople,jdbcType=VARCHAR}, #{approveDepartment,jdbcType=VARCHAR}, #{approveNote,jdbcType=VARCHAR},
+      #{approveTime,jdbcType=TIMESTAMP}, #{deleteState,jdbcType=VARCHAR}, #{orgId,jdbcType=VARCHAR},
+      #{fumigationFrequency,jdbcType=INTEGER}, #{cgxzfs,jdbcType=VARCHAR}, #{hlxzfs,jdbcType=VARCHAR},
+      #{hlxzynhljsjh,jdbcType=VARCHAR}, #{xzfazd,jdbcType=VARCHAR}, #{xzfaqcr,jdbcType=VARCHAR},
+      #{xzfapzr,jdbcType=VARCHAR}, #{xzfabbqk,jdbcType=VARCHAR}, #{xzfzr,jdbcType=VARCHAR},
       #{hcjcdh,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.intelligent.fumigation.model.TFumigationPlan" >
@@ -781,7 +781,19 @@
     approval.operator operator
     FROM
     t_fumigation_plan plan
-    LEFT JOIN t_fumigation_pesticide pes ON pes.fumigation_id = plan.id
+    LEFT JOIN (
+    SELECT
+    pest.fumigation_id,
+    pest.drug_name
+    FROM
+    t_fumigation_pesticide pest
+    WHERE
+    pest.org_id = #{orgId,jdbcType=INTEGER}
+    GROUP BY
+    pest.fumigation_id
+    ORDER BY
+    pest.updatetime
+    ) pes ON pes.fumigation_id = plan.id
     LEFT JOIN business_approval approval ON plan.id = approval.task_id
     WHERE plan.org_id = #{orgId,jdbcType=INTEGER}
     AND plan.state != 1
@@ -796,7 +808,7 @@
     select
     plan.*
     FROM t_fumigation_plan plan
-    LEFT JOIN t_fumigation_process pro ON pro.fumigation_id = plan.id
+    LEFT JOIN t_fumigation_process pro ON pro.fumigation_id = plan.id AND pro.delete_state = 1
     WHERE 1=1
     <if test="houseId != null" >
       AND plan.house_id = #{houseId,jdbcType=INTEGER}
@@ -820,11 +832,11 @@
     basic_storehouse sh
     INNER JOIN t_ccvalue tc ON tc.org_id = sh.org_id AND tc.v_cf_code = sh.storehouse_code
     where not exists (SELECT hcjcdh FROM t_fumigation_plan tp
-    WHERE  tp.id != #{fumigationId,jdbcType=VARCHAR} AND tp.hcjcdh = tc.hcjcdh)
+    WHERE tp.delete_state = 1 AND tp.id != #{fumigationId,jdbcType=VARCHAR} AND tp.hcjcdh = tc.hcjcdh)
     <if test="houseId != null">
       AND sh.storehouse_id = #{houseId,jdbcType=INTEGER}
     </if>
     AND tc.hcjcdh is not null
-    GROUP BY tc.hcjcdh
+    GROUP BY tc.hcjcdh ORDER BY tc.updatetime desc
   </select>
 </mapper>