diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemFaq.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemFaq.java
index 0ab8ed40d..6a146d874 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemFaq.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemFaq.java
@@ -45,6 +45,8 @@ public class EmisWaybillProblemFaq extends BaseEntity
     private String content;
     /* 状态 0-初始 1-启用 */
     private Integer status;
+    /* 0-未处理 1-已处理 2-处理中 */
+    private String dealResult;
     /* 是否显示 1-显示 0-不显示 */
     private String showFlag;
     /* 针对的回复的ID */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
index d889d0bb7..df23a8503 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
@@ -79,6 +79,8 @@ public class EmisWaybillProblemInfo extends BaseEntity
     private Date reversionDate;
     /* 是否检查 0-否 1-是 */
     private String blCheckok;
+    /* 0-未处理 1-处理中 2-处理完毕 */
+    private String dealResult;
     /* 是否查看 0-否 1-是 */
     private String blSee;
     /* 文件路径 */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemFaqServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemFaqServiceImpl.java
index 4184430b2..6c357e94b 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemFaqServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemFaqServiceImpl.java
@@ -83,6 +83,8 @@ public class EmisWaybillProblemFaqServiceImpl extends EmisBaseService implements
             newEmisWaybillProblemInfo.setReversionManCode(getCurrentUser().getEmpCode());
             newEmisWaybillProblemInfo.setReversionSiteCode(getCurrentUser().getOwnerSiteCode());
             newEmisWaybillProblemInfo.setBlReversion("1");
+            newEmisWaybillProblemInfo.setDealResult(emisWaybillProblemFaq.getDealResult());
+            newEmisWaybillProblemInfo.setReversionStr(emisWaybillProblemFaq.getContent());
 
             emisWaybillProblemInfoMapper.updateEmisWaybillProblemInfo(newEmisWaybillProblemInfo);
         }
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillProblemFaqMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillProblemFaqMapper.xml
index e5fd28458..e3db1c192 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillProblemFaqMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillProblemFaqMapper.xml
@@ -11,25 +11,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="title"    column="title"    />
         <result property="content"    column="content"    />
         <result property="status"    column="status"    />
+        <result property="dealResult"    column="deal_result"    />
         <result property="showFlag"    column="show_flag"    />
         <result property="replayId"    column="replay_id"    />
 
     </resultMap>
 
     <sql id="selectEmisWaybillProblemFaqVo">
-        select id, prob_id, bill_code, title, content, status, show_flag, replay_id, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill_problem_faq
+        select id, prob_id, bill_code, title, content, status, deal_result, show_flag, replay_id, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill_problem_faq
     </sql>
 
     <select id="selectEmisWaybillProblemFaqList" parameterType="EmisWaybillProblemFaq" resultMap="EmisWaybillProblemFaqResult">
         <include refid="selectEmisWaybillProblemFaqVo"/>
         <where>
-             del_flag='0'
+            del_flag='0'
             <if test="id != null "> and id = #{id}</if>
             <if test="probId != null "> and prob_id = #{probId}</if>
             <if test="billCode != null  and billCode != ''"> and bill_code like concat('%', #{billCode}, '%')</if>
             <if test="title != null  and title != ''"> and title like concat('%', #{title}, '%')</if>
             <if test="content != null  and content != ''"> and content like concat('%', #{content}, '%')</if>
             <if test="status != null "> and status = #{status}</if>
+            <if test="dealResult != null  and dealResult != ''"> and deal_result like concat('%', #{dealResult}, '%')</if>
             <if test="showFlag != null  and showFlag != ''"> and show_flag like concat('%', #{showFlag}, '%')</if>
             <if test="replayId != null "> and replay_id = #{replayId}</if>
             <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
@@ -45,12 +47,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
   
     <select id="selectEmisWaybillProblemFaqById" parameterType="Long" resultMap="EmisWaybillProblemFaqResult">
-        select id, prob_id, bill_code, title, content, status, show_flag, replay_id, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site 
+        select id, prob_id, bill_code, title, content, status, deal_result, show_flag, replay_id, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site
         from emis_waybill_problem_faq a
         where a.id = #{id}
     </select>
-        
-    <insert id="insertEmisWaybillProblemFaq" parameterType="EmisWaybillProblemFaq">
+
+    <insert id="insertEmisWaybillProblemFaq" parameterType="EmisWaybillProblemFaq" useGeneratedKeys="true" keyProperty="id">
         insert into emis_waybill_problem_faq
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -59,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null and title != ''">title,</if>
             <if test="content != null and content != ''">content,</if>
             <if test="status != null">status,</if>
+            <if test="dealResult != null and dealResult != ''">deal_result,</if>
             <if test="showFlag != null and showFlag != ''">show_flag,</if>
             <if test="replayId != null">replay_id,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
@@ -69,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null and remark != ''">remark,</if>
             <if test="createSite != null and createSite != ''">create_site,</if>
             <if test="updateSite != null and updateSite != ''">update_site,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="probId != null">#{probId},</if>
@@ -77,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null and title != ''">#{title},</if>
             <if test="content != null and content != ''">#{content},</if>
             <if test="status != null">#{status},</if>
+            <if test="dealResult != null and dealResult != ''">#{dealResult},</if>
             <if test="showFlag != null and showFlag != ''">#{showFlag},</if>
             <if test="replayId != null">#{replayId},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
@@ -87,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null and remark != ''">#{remark},</if>
             <if test="createSite != null and createSite != ''">#{createSite},</if>
             <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateEmisWaybillProblemFaq" parameterType="EmisWaybillProblemFaq">
@@ -98,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null and title != ''">title = #{title},</if>
             <if test="content != null and content != ''">content = #{content},</if>
             <if test="status != null">status = #{status},</if>
+            <if test="dealResult != null and dealResult != ''">deal_result = #{dealResult},</if>
             <if test="showFlag != null and showFlag != ''">show_flag = #{showFlag},</if>
             <if test="replayId != null">replay_id = #{replayId},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
index 3e9cba036..6de3df502 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
@@ -27,6 +27,7 @@
         <result property="reversionSiteCode"    column="reversion_site_code"    />
         <result property="reversionDate"    column="reversion_date"    />
         <result property="blCheckok"    column="bl_checkok"    />
+        <result property="dealResult"    column="deal_result"    />
         <result property="blSee"    column="bl_see"    />
         <result property="filePath"    column="file_path"    />
 
@@ -40,7 +41,7 @@
     </resultMap>
 
     <sql id="selectEmisWaybillProblemInfoVo">
-        select id, bill_code, problem_type, problem_title, problem_cause, send_site, send_site_code, register_man_code, register_man_dept, register_site_code, register_date, register_save_date, data_from, status, is_send_site_register, bl_reversion, reversion_str, reversion_man, reversion_man_code, reversion_date, bl_checkok, bl_see, file_path, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill_problem_info
+        select id, bill_code, problem_type, problem_title, problem_cause, send_site, send_site_code, register_man_code, register_man_dept, register_site_code, register_date, register_save_date, data_from, status, is_send_site_register, bl_reversion, reversion_str, reversion_man, reversion_man_code, reversion_site_code, reversion_date, bl_checkok, deal_result, bl_see, file_path, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill_problem_info
     </sql>
 
     <select id="selectEmisWaybillProblemInfoList" parameterType="EmisWaybillProblemInfo" resultMap="EmisWaybillProblemInfoResult">
@@ -58,16 +59,17 @@
             <if test="registerManDept != null  and registerManDept != ''"> and register_man_dept like concat('%', #{registerManDept}, '%')</if>
             <if test="registerSiteCode != null  and registerSiteCode != ''"> and register_site_code=#{registerSiteCode}</if>
             <if test="registerDate != null "> and register_date = #{registerDate}</if>
-            <if test="dataFrom != null  and dataFrom != ''"> and data_from like concat('%', #{dataFrom}, '%')</if>
-            <if test="status != null  and status != ''"> and status like concat('%', #{status}, '%')</if>
-            <if test="isSendSiteRegister != null  and isSendSiteRegister != ''"> and is_send_site_register like concat('%', #{isSendSiteRegister}, '%')</if>
+            <if test="dataFrom != null  and dataFrom != ''"> and data_from=#{dataFrom}</if>
+            <if test="status != null  and status != ''"> and status=#{status}</if>
+            <if test="isSendSiteRegister != null  and isSendSiteRegister != ''"> and is_send_site_register=#{isSendSiteRegister}</if>
+            <if test="dealResult != null  and dealResult != ''"> and deal_result=#{dealResult}</if>
             <if test="blReversion != null  and blReversion != ''"> and bl_reversion=#{blReversion}</if>
             <if test="reversionStr != null  and reversionStr != ''"> and reversion_str like concat('%', #{reversionStr}, '%')</if>
             <if test="reversionMan != null  and reversionMan != ''"> and reversion_man like concat('%', #{reversionMan}, '%')</if>
-            <if test="reversionManCode != null  and reversionManCode != ''"> and reversion_man_code like concat('%', #{reversionManCode}, '%')</if>
+            <if test="reversionManCode != null  and reversionManCode != ''"> and reversion_man_code=#{reversionManCode}</if>
             <if test="reversionDate != null  and reversionDate != ''"> and reversion_date like concat('%', #{reversionDate}, '%')</if>
             <if test="blCheckok != null  and blCheckok != ''"> and bl_checkok=#{blCheckok}</if>
-            <if test="blSee != null  and blSee != ''"> and bl_see like concat('%', #{blSee}, '%')</if>
+            <if test="blSee != null  and blSee != ''"> and bl_see=#{blSee}</if>
             <if test="filePath != null  and filePath != ''"> and file_path like concat('%', #{filePath}, '%')</if>
             <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
             <if test="createBy != null  and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
@@ -113,7 +115,7 @@
     </select>
 
     <select id="selectEmisWaybillProblemInfoById" parameterType="Long" resultMap="EmisWaybillProblemInfoResult">
-        select id, bill_code, problem_type, problem_title, problem_cause, send_site, send_site_code, register_man_code, register_man_dept, register_site_code, register_date, register_save_date, data_from, status, is_send_site_register, bl_reversion, reversion_str, reversion_man, reversion_man_code, reversion_date, bl_checkok, bl_see, file_path, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site
+        select id, bill_code, problem_type, problem_title, problem_cause, send_site, send_site_code, register_man_code, register_man_dept, register_site_code, register_date, register_save_date, data_from, status, is_send_site_register, bl_reversion, reversion_str, reversion_man, reversion_man_code, reversion_site_code, reversion_date, bl_checkok, deal_result, bl_see, file_path, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill_problem_info
         from emis_waybill_problem_info a
         where a.id = #{id}
     </select>
@@ -123,7 +125,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="billCode != null and billCode != ''">bill_code,</if>
-            <if test="problemType != null and problemType != ''">problem_type,</if>
+            <if test="problemType != null">problem_type,</if>
             <if test="problemTitle != null and problemTitle != ''">problem_title,</if>
             <if test="problemCause != null and problemCause != ''">problem_cause,</if>
             <if test="sendSite != null and sendSite != ''">send_site,</if>
@@ -140,8 +142,10 @@
             <if test="reversionStr != null and reversionStr != ''">reversion_str,</if>
             <if test="reversionMan != null and reversionMan != ''">reversion_man,</if>
             <if test="reversionManCode != null and reversionManCode != ''">reversion_man_code,</if>
-            <if test="reversionDate != null and reversionDate != ''">reversion_date,</if>
+            <if test="reversionSiteCode != null and reversionSiteCode != ''">reversion_site_code,</if>
+            <if test="reversionDate != null">reversion_date,</if>
             <if test="blCheckok != null and blCheckok != ''">bl_checkok,</if>
+            <if test="dealResult != null and dealResult != ''">deal_result,</if>
             <if test="blSee != null and blSee != ''">bl_see,</if>
             <if test="filePath != null and filePath != ''">file_path,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
@@ -156,7 +160,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="billCode != null and billCode != ''">#{billCode},</if>
-            <if test="problemType != null and problemType != ''">#{problemType},</if>
+            <if test="problemType != null">#{problemType},</if>
             <if test="problemTitle != null and problemTitle != ''">#{problemTitle},</if>
             <if test="problemCause != null and problemCause != ''">#{problemCause},</if>
             <if test="sendSite != null and sendSite != ''">#{sendSite},</if>
@@ -173,8 +177,10 @@
             <if test="reversionStr != null and reversionStr != ''">#{reversionStr},</if>
             <if test="reversionMan != null and reversionMan != ''">#{reversionMan},</if>
             <if test="reversionManCode != null and reversionManCode != ''">#{reversionManCode},</if>
-            <if test="reversionDate != null and reversionDate != ''">#{reversionDate},</if>
+            <if test="reversionSiteCode != null and reversionSiteCode != ''">#{reversionSiteCode},</if>
+            <if test="reversionDate != null">#{reversionDate},</if>
             <if test="blCheckok != null and blCheckok != ''">#{blCheckok},</if>
+            <if test="dealResult != null and dealResult != ''">#{dealResult},</if>
             <if test="blSee != null and blSee != ''">#{blSee},</if>
             <if test="filePath != null and filePath != ''">#{filePath},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
@@ -192,7 +198,7 @@
         update emis_waybill_problem_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
-            <if test="problemType != null and problemType != ''">problem_type = #{problemType},</if>
+            <if test="problemType != null">problem_type = #{problemType},</if>
             <if test="problemTitle != null and problemTitle != ''">problem_title = #{problemTitle},</if>
             <if test="problemCause != null and problemCause != ''">problem_cause = #{problemCause},</if>
             <if test="sendSite != null and sendSite != ''">send_site = #{sendSite},</if>
@@ -209,8 +215,10 @@
             <if test="reversionStr != null and reversionStr != ''">reversion_str = #{reversionStr},</if>
             <if test="reversionMan != null and reversionMan != ''">reversion_man = #{reversionMan},</if>
             <if test="reversionManCode != null and reversionManCode != ''">reversion_man_code = #{reversionManCode},</if>
-            <if test="reversionDate != null and reversionDate != ''">reversion_date = #{reversionDate},</if>
+            <if test="reversionSiteCode != null and reversionSiteCode != ''">reversion_site_code = #{reversionSiteCode},</if>
+            <if test="reversionDate != null">reversion_date = #{reversionDate},</if>
             <if test="blCheckok != null and blCheckok != ''">bl_checkok = #{blCheckok},</if>
+            <if test="dealResult != null and dealResult != ''">deal_result = #{dealResult},</if>
             <if test="blSee != null and blSee != ''">bl_see = #{blSee},</if>
             <if test="filePath != null and filePath != ''">file_path = #{filePath},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
@@ -226,11 +234,11 @@
     </update>
 
     <delete id="deleteEmisWaybillProblemInfoById" parameterType="Long">
-        delete from emis_waybill_problem_info where id = #{id}
+        update emis_waybill_problem_info set del_flag='1' where id = #{id}
     </delete>
 
     <delete id="deleteEmisWaybillProblemInfoByIds" parameterType="String">
-        delete from emis_waybill_problem_info where id in
+        update emis_waybill_problem_info set del_flag='1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>