fix

src/main/java/com/chinaitop/depot/fumigation/controller/FumigationProcessController.java

@@ -167,8 +167,11 @@ public class FumigationProcessController {
             modelMap.put("fumigationEdit",fumigationForrecord);//熏蒸方案数据
 
             Map<String, Object> pesticide = fumigationForRecordService.findYjxxById(tFumigationProcess.getRecordId());
-            modelMap.put("drugName",pesticide.get("drugname"));//获取药剂名称
-            modelMap.put("reagentType",pesticide.get("reagenttype"));//获取药剂剂型名称
+            if(pesticide!=null){
+                modelMap.put("drugName",pesticide.get("drugname"));//获取药剂名称
+                modelMap.put("reagentType",pesticide.get("reagenttype"));//获取药剂剂型名称
+            }
+
 
 //            List<TQtdevinfoValue> tQtdevinfoValue = gasDetectionService.getList("","","","'"+tFumigationProcess.getDcsqtinfoId()+"'");
 //            modelMap.put("tQtdevinfoEdit",tQtdevinfoValue);//气体数据

src/main/java/com/chinaitop/depot/fumigation/mapper/TFumigationAfterMapper.xml

@@ -41,6 +41,7 @@
     <result column="pyswthhcs" property="pyswthhcs" jdbcType="INTEGER" />
     <result column="pysswthhcs" property="pysswthhcs" jdbcType="INTEGER" />
     <result column="xzxgpj" property="xzxgpj" jdbcType="VARCHAR" />
+    <result column="record_id" property="recordId" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -108,7 +109,7 @@
     sampling_culture_month_half, kill_insect_rate, check_insect_cage_time, insect_cage_kill_rate, 
     effect_analysis, creater, create_time, update_time, org_id, delete_state, updatetime, 
     czsjzysj, czsjzyrs, czsjff, czsjzypzr, czclcs, czclzyrs, czclpzr, xzhhcjcqk, xzhckmd, 
-    pyswthhcs, pysswthhcs, xzxgpj
+    pyswthhcs, pysswthhcs, xzxgpj,record_id
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.fumigation.model.TFumigationAfterExample" >
     select
@@ -156,7 +157,7 @@
       czsjzyrs, czsjff, czsjzypzr, 
       czclcs, czclzyrs, czclpzr, 
       xzhhcjcqk, xzhckmd, pyswthhcs, 
-      pysswthhcs, xzxgpj)
+      pysswthhcs, xzxgpj,record_id)
     values (#{id,jdbcType=VARCHAR}, #{houseId,jdbcType=INTEGER}, #{fumigationId,jdbcType=VARCHAR}, 
       #{residueCollectionTime,jdbcType=VARCHAR}, #{numberOperationsCollected,jdbcType=VARCHAR}, 
       #{residueCollectionMethod,jdbcType=VARCHAR}, #{collectJobApprover,jdbcType=VARCHAR}, 
@@ -172,7 +173,7 @@
       #{czsjzyrs,jdbcType=INTEGER}, #{czsjff,jdbcType=VARCHAR}, #{czsjzypzr,jdbcType=VARCHAR}, 
       #{czclcs,jdbcType=VARCHAR}, #{czclzyrs,jdbcType=INTEGER}, #{czclpzr,jdbcType=VARCHAR}, 
       #{xzhhcjcqk,jdbcType=VARCHAR}, #{xzhckmd,jdbcType=INTEGER}, #{pyswthhcs,jdbcType=INTEGER}, 
-      #{pysswthhcs,jdbcType=INTEGER}, #{xzxgpj,jdbcType=VARCHAR})
+      #{pysswthhcs,jdbcType=INTEGER}, #{xzxgpj,jdbcType=VARCHAR},#{recordId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.fumigation.model.TFumigationAfter" >
     insert into t_fumigation_after

src/main/java/com/chinaitop/depot/fumigation/mapper/TFumigationProcessMapper.xml

@@ -86,6 +86,7 @@
     <result column="sqpzr" property="sqpzr" jdbcType="VARCHAR" />
     <result column="sqcsts" property="sqcsts" jdbcType="INTEGER" />
     <result column="sqjsslhqnd" property="sqjsslhqnd" jdbcType="DECIMAL" />
+    <result column="record_id" property="recordId" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -161,7 +162,7 @@
     perforated_end, bulk_gas_type, drug_residue_rate, perforated_approver, dcsqtinfo_id, 
     task_state, task_end_time, creater, create_time, update_time, org_id, delete_state, 
     data_source, updatetime, yqbjyaqjc, byqcnlhqnd, mbnd, jsbyl, byzypzr, fznd, mbndwcts, 
-    lswzjc, lqbwcqdbjcs, mbsj, ctz, sqqlhqnd, sqpzr, sqcsts, sqjsslhqnd
+    lswzjc, lqbwcqdbjcs, mbsj, ctz, sqqlhqnd, sqpzr, sqcsts, sqjsslhqnd,record_id
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.fumigation.model.TFumigationProcessExample" >
     select
@@ -1482,7 +1483,7 @@
     record.house_id houseId,
     record.lspz grainKind,
     record.yjmc drugName,
-    record.cgxzfs fumigationType,
+    record.xzfs fumigationType,
     record.creater,
     pro.task_end_time taskEndTime
     FROM

src/main/java/com/chinaitop/depot/fumigation/service/FumigationProcessService.java

@@ -23,6 +23,6 @@ public interface FumigationProcessService {
 
     void updateByExample(TFumigationProcess tFumigationProcess, TFumigationProcessExample example);
 
-    //根据熏蒸方案id查询熏蒸作业过程数据
+    //根据熏蒸备案id查询熏蒸作业过程数据
     List<TFumigationProcess> getDataByFumId(TFumigationProcessExample example);
 }