diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McVisit.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McVisit.java
index a343708..14422e2 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McVisit.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McVisit.java
@@ -246,13 +246,13 @@ public class McVisit extends BaseEntity
     @ExcelProperty(value = "附件(文件id，逗号分隔)")
     private String attachmentFile;
 
-    /** 状态代码 */
-    @ExcelProperty(value = "状态代码")
-    private String statusCode;
-
-    /** 状态名称 */
-    @ExcelProperty(value = "状态名称")
-    private String statusName;
+//    /** 状态代码 */
+//    @ExcelProperty(value = "状态代码")
+//    private String statusCode;
+//
+//    /** 状态名称 */
+//    @ExcelProperty(value = "状态名称")
+//    private String statusName;
 
     /** 删除标志（0：未删除，1：已删除） */
     @ExcelProperty(value = "删除标志")
@@ -262,6 +262,13 @@ public class McVisit extends BaseEntity
     @ExcelProperty(value = "工单类型")
     private String ticketType;
 
+    /** 发布状态 */
+    private String publishStatus;
+    /** 修改状态 */
+    private String modificationStatus;
+    /** 状态节点名称 */
+    private String statusNodeName;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -739,24 +746,24 @@ public class McVisit extends BaseEntity
     {
         return attachmentFile;
     }
-    public void setStatusCode(String statusCode)
-    {
-        this.statusCode = statusCode;
-    }
-
-    public String getStatusCode()
-    {
-        return statusCode;
-    }
-    public void setStatusName(String statusName)
-    {
-        this.statusName = statusName;
-    }
-
-    public String getStatusName()
-    {
-        return statusName;
-    }
+//    public void setStatusCode(String statusCode)
+//    {
+//        this.statusCode = statusCode;
+//    }
+//
+//    public String getStatusCode()
+//    {
+//        return statusCode;
+//    }
+//    public void setStatusName(String statusName)
+//    {
+//        this.statusName = statusName;
+//    }
+//
+//    public String getStatusName()
+//    {
+//        return statusName;
+//    }
     public void setDefFlag(String defFlag)
     {
         this.defFlag = defFlag;
@@ -776,71 +783,28 @@ public class McVisit extends BaseEntity
         return ticketType;
     }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("ticketNumber", getTicketNumber())
-            .append("fiscalYear", getFiscalYear())
-            .append("regionName", getRegionName())
-            .append("groupName", getGroupName())
-            .append("companyName", getCompanyName())
-            .append("companyCode", getCompanyCode())
-            .append("billingPersonId", getBillingPersonId())
-            .append("billingPersonName", getBillingPersonName())
-            .append("billingPersonAccount", getBillingPersonAccount())
-            .append("jobNature", getJobNature())
-            .append("entryTime", getEntryTime())
-            .append("vlgOrCmty", getVlgOrCmty())
-            .append("urbRurCls", getUrbRurCls())
-            .append("userName", getUserName())
-            .append("userPhone", getUserPhone())
-            .append("userProvince", getUserProvince())
-            .append("userCity", getUserCity())
-            .append("userDistrict", getUserDistrict())
-            .append("userStreet", getUserStreet())
-            .append("userDetailedAddress", getUserDetailedAddress())
-            .append("hasDm", getHasDm())
-            .append("dmAge", getDmAge())
-            .append("dmIncomeSrc", getDmIncomeSrc())
-            .append("dmPhone", getDmPhone())
-            .append("isCharged", getIsCharged())
-            .append("userCode", getUserCode())
-            .append("userIdCard", getUserIdCard())
-            .append("invoiceNo", getInvoiceNo())
-            .append("chargeAmt", getChargeAmt())
-            .append("paymentMeth", getPaymentMeth())
-            .append("chargeType", getChargeType())
-            .append("isVisited", getIsVisited())
-            .append("isIntent", getIsIntent())
-            .append("houseCondition", getHouseCondition())
-            .append("currentCookingEnergy", getCurrentCookingEnergy())
-            .append("currentHeatingEnergy", getCurrentHeatingEnergy())
-            .append("familyMembers", getFamilyMembers())
-            .append("fridgeStatus", getFridgeStatus())
-            .append("acStatus", getAcStatus())
-            .append("tvStatus", getTvStatus())
-            .append("washerStatus", getWasherStatus())
-            .append("waterHeaterStatus", getWaterHeaterStatus())
-            .append("pvSystemStatus", getPvSystemStatus())
-            .append("visitProvince", getVisitProvince())
-            .append("visitCity", getVisitCity())
-            .append("visitDistrict", getVisitDistrict())
-            .append("visitStreet", getVisitStreet())
-            .append("visitDetailedAddress", getVisitDetailedAddress())
-            .append("visitLongitude", getVisitLongitude())
-            .append("visitLatitude", getVisitLatitude())
-            .append("fieldPhotoFile", getFieldPhotoFile())
-            .append("attachmentFile", getAttachmentFile())
-            .append("statusCode", getStatusCode())
-            .append("statusName", getStatusName())
-            .append("remark", getRemark())
-            .append("createTime", getCreateTime())
-            .append("createBy", getCreateBy())
-            .append("updateTime", getUpdateTime())
-            .append("updateBy", getUpdateBy())
-            .append("defFlag", getDefFlag())
-            .append("ticketType", getTicketType())
-            .toString();
+
+    public String getPublishStatus() {
+        return publishStatus;
+    }
+
+    public void setPublishStatus(String publishStatus) {
+        this.publishStatus = publishStatus;
+    }
+
+    public String getModificationStatus() {
+        return modificationStatus;
+    }
+
+    public void setModificationStatus(String modificationStatus) {
+        this.modificationStatus = modificationStatus;
+    }
+
+    public String getStatusNodeName() {
+        return statusNodeName;
+    }
+
+    public void setStatusNodeName(String statusNodeName) {
+        this.statusNodeName = statusNodeName;
     }
 }
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/enums/VisitModificationStatusEnums.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/enums/VisitModificationStatusEnums.java
new file mode 100644
index 0000000..06e9f81
--- /dev/null
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/enums/VisitModificationStatusEnums.java
@@ -0,0 +1,27 @@
+package com.chinagas.modules.schsf.enums;
+
+/**
+ * 拜访-修改状态
+ */
+public enum VisitModificationStatusEnums {
+
+    REJECTED("REJECTED", "驳回"),
+    APPROVED("APPROVED", "通过"),
+    PENDING_LEVEL_1_AUDIT("PENDING_LEVEL_1_AUDIT", "待一级审核"),
+    PENDING_LEVEL_2_AUDIT("PENDING_LEVEL_2_AUDIT", "待二级审核");
+
+    private final String code;
+    private final String info;
+
+
+    public String getCode() {
+        return code;
+    }
+    public String getInfo() {
+        return info;
+    }
+    VisitModificationStatusEnums(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+}
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/enums/VisitPublishStatusEnums.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/enums/VisitPublishStatusEnums.java
new file mode 100644
index 0000000..ac4273a
--- /dev/null
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/enums/VisitPublishStatusEnums.java
@@ -0,0 +1,31 @@
+package com.chinagas.modules.schsf.enums;
+
+/**
+ * 拜访-发布状态
+ */
+public enum VisitPublishStatusEnums {
+
+
+    REJECTED("REJECTED", "驳回"),
+    APPROVED("APPROVED", "通过"),
+    PENDING_LEVEL_1_AUDIT("PENDING_LEVEL_1_AUDIT", "待一级审核"),
+    PENDING_LEVEL_2_AUDIT("PENDING_LEVEL_2_AUDIT", "待二级审核");
+
+    private final String code;
+    private final String info;
+
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+
+    VisitPublishStatusEnums(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+}
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McIgnitionServiceImpl.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McIgnitionServiceImpl.java
index eb4698e..1221b19 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McIgnitionServiceImpl.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McIgnitionServiceImpl.java
@@ -2,8 +2,10 @@ package com.chinagas.modules.schsf.service.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.chinagas.common.core.utils.DateUtils;
+import com.chinagas.common.core.utils.StringUtils;
 import com.chinagas.modules.schsf.domain.McIgnition;
 import com.chinagas.modules.schsf.domain.McVisit;
+import com.chinagas.modules.schsf.enums.YesNoEnums;
 import com.chinagas.modules.schsf.mapper.McIgnitionMapper;
 import com.chinagas.modules.schsf.service.IMcIgnitionService;
 import com.chinagas.modules.schsf.service.IMcOperationLogService;
@@ -33,6 +35,10 @@ public class McIgnitionServiceImpl implements IMcIgnitionService {
      */
     @Override
     public int insertMcVisitByMcIgnition(McVisit mcVisit) {
+        if (StringUtils.isEmpty(mcVisit.getIsCharged()) || mcVisit.getIsCharged().equals(YesNoEnums.NO.getCode())) {
+            return 0;
+        }
+
         McIgnition mcIgnition = new McIgnition();
         mcIgnition.setRegionName(mcVisit.getRegionName());
         mcIgnition.setGroupName(mcVisit.getGroupName());
@@ -45,7 +51,9 @@ public class McIgnitionServiceImpl implements IMcIgnitionService {
         mcIgnition.setUserStreet(mcVisit.getUserStreet());
         mcIgnition.setVlgOrCmty(mcVisit.getVlgOrCmty());
         List<McIgnition> mcIgnitions = mcIgnitionMapper.selectMcIgnitionParamList(mcIgnition);
-        if (!mcIgnitions.isEmpty()) {return 0;}
+        if (!mcIgnitions.isEmpty()) {
+            return 0;
+        }
 
         mcIgnition.setVisitId(mcVisit.getId());
         mcIgnition.setUrbRurCls(mcVisit.getUrbRurCls());
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java
index d1ae0fb..c118530 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java
@@ -6,6 +6,7 @@ import com.chinagas.common.core.utils.StringUtils;
 import com.chinagas.common.security.utils.SecurityUtils;
 import com.chinagas.modules.schsf.domain.McOperationLog;
 import com.chinagas.modules.schsf.domain.McVisit;
+import com.chinagas.modules.schsf.enums.VisitPublishStatusEnums;
 import com.chinagas.modules.schsf.enums.VisitTypeEnums;
 import com.chinagas.modules.schsf.enums.YesNoEnums;
 import com.chinagas.modules.schsf.mapper.McVisitMapper;
@@ -65,6 +66,12 @@ public class McVisitServiceImpl implements IMcVisitService {
      * @param mcVisit 拜访工单
      * @return 结果
      */
+
+
+//    驳回: REJECTED
+//    通过: APPROVED
+//    待一级审核: PENDING_LEVEL_1_AUDIT
+//    待二级审核: PENDING_LEVEL_2_AUDIT
     @Override
     public int insertMcVisit(McVisit mcVisit) {
         mcVisit.setIsCharged(StringUtils.nvl(mcVisit.getIsCharged(),  YesNoEnums.NO.getCode()));
@@ -81,13 +88,16 @@ public class McVisitServiceImpl implements IMcVisitService {
         mcVisit.setTicketNumber(getTicketNumber());
         //工单类型
         mcVisit.setTicketType(getTicketType(mcVisit.getIsCharged(), mcVisit.getIsVisited()));
+        //状态
+        mcVisit.setPublishStatus(mcVisit.getIsCharged().equals(YesNoEnums.YES.getCode())? VisitPublishStatusEnums.PENDING_LEVEL_1_AUDIT.getCode():VisitPublishStatusEnums.APPROVED.getCode());
+        mcVisit.setModificationStatus(null);
         int id = mcVisitMapper.insertMcVisit(mcVisit);
         //1:添加记录
         iMcOperationLogService.insertMcOperationLog("mc_visit", mcVisit.getId(), "项目公司_收费员",
                 mcVisit.getBillingPersonName(), mcVisit.getBillingPersonAccount(), mcVisit.getCreateTime(),
                 "发起", "1", null, null, JSON.toJSONString(mcVisit));
-        //2：判断是否需要添加至点火记录
-        iMcIgnitionService.insertMcVisitByMcIgnition(mcVisit);
+//        //2：判断是否需要添加至点火记录
+//        iMcIgnitionService.insertMcVisitByMcIgnition(mcVisit);
         return id;
 
     }
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml
index d96bd4d..d569ee8 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.chinagas.modules.schsf.mapper.McVisitMapper">
 
     <resultMap type="com.chinagas.modules.schsf.domain.McVisit" id="McVisitResult">
@@ -58,8 +58,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="visitLatitude"    column="visit_latitude"    />
         <result property="fieldPhotoFile"    column="field_photo_file"    />
         <result property="attachmentFile"    column="attachment_file"    />
-        <result property="statusCode"    column="status_code"    />
-        <result property="statusName"    column="status_name"    />
         <result property="remark"    column="remark"    />
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
@@ -67,10 +65,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="defFlag"    column="def_flag"    />
         <result property="ticketType"    column="ticket_type"    />
+        <result property="publishStatus"    column="publish_status"    />
+        <result property="modificationStatus"    column="modification_status"    />
+        <result property="statusNodeName"    column="status_node_name"    />
     </resultMap>
 
     <sql id="selectMcVisitVo">
-        select id, ticket_number, fiscal_year, region_name, group_name, company_name, company_code, billing_person_id, billing_person_name, billing_person_account, job_nature, entry_time, vlg_or_cmty, urb_rur_cls, user_name, user_phone, user_province, user_city, user_district, user_street, user_detailed_address, has_dm, dm_age, dm_income_src, dm_phone, is_charged, user_code, user_id_card, invoice_no, charge_amt, payment_meth, charge_type, is_visited, is_intent, house_condition, current_cooking_energy, current_heating_energy, family_members, fridge_status, ac_status, tv_status, washer_status, water_heater_status, pv_system_status, visit_province, visit_city, visit_district, visit_street, visit_detailed_address, visit_longitude, visit_latitude, field_photo_file, attachment_file, status_code, status_name, remark, create_time, create_by, update_time, update_by, def_flag, ticket_type from mc_visit
+        select id, ticket_number, fiscal_year, region_name, group_name, company_name, company_code, billing_person_id, billing_person_name, billing_person_account, job_nature, entry_time, vlg_or_cmty, urb_rur_cls, user_name, user_phone, user_province, user_city, user_district, user_street, user_detailed_address, has_dm, dm_age, dm_income_src, dm_phone, is_charged, user_code, user_id_card, invoice_no, charge_amt, payment_meth, charge_type, is_visited, is_intent, house_condition, current_cooking_energy, current_heating_energy, family_members, fridge_status, ac_status, tv_status, washer_status, water_heater_status, pv_system_status, visit_province, visit_city, visit_district, visit_street, visit_detailed_address, visit_longitude, visit_latitude, field_photo_file, attachment_file, remark, create_time, create_by, update_time, update_by, def_flag, ticket_type, publish_status, modification_status, status_node_name from mc_visit
     </sql>
 
     <select id="selectMcVisitList" parameterType="com.chinagas.modules.schsf.domain.McVisit" resultMap="McVisitResult">
@@ -128,10 +129,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="visitLatitude != null "> and visit_latitude = #{visitLatitude}</if>
             <if test="fieldPhotoFile != null  and fieldPhotoFile != ''"> and field_photo_file = #{fieldPhotoFile}</if>
             <if test="attachmentFile != null  and attachmentFile != ''"> and attachment_file = #{attachmentFile}</if>
-            <if test="statusCode != null  and statusCode != ''"> and status_code = #{statusCode}</if>
-            <if test="statusName != null  and statusName != ''"> and status_name like concat('%', #{statusName}, '%')</if>
             <if test="defFlag != null  and defFlag != ''"> and def_flag = #{defFlag}</if>
             <if test="ticketType != null  and ticketType != ''"> and ticket_type = #{ticketType}</if>
+            <if test="publishStatus != null  and publishStatus != ''"> and publish_status = #{publishStatus}</if>
+            <if test="modificationStatus != null  and modificationStatus != ''"> and modification_status = #{modificationStatus}</if>
+            <if test="statusNodeName != null  and statusNodeName != ''"> and status_node_name like concat('%', #{statusNodeName}, '%')</if>
         </where>
     </select>
 
@@ -140,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <insert id="insertMcVisit" parameterType="com.chinagas.modules.schsf.domain.McVisit"  useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertMcVisit" parameterType="com.chinagas.modules.schsf.domain.McVisit"   useGeneratedKeys="true" keyProperty="id">
         insert into mc_visit
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -153,7 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="billingPersonId != null">billing_person_id,</if>
             <if test="billingPersonName != null and billingPersonName != ''">billing_person_name,</if>
             <if test="billingPersonAccount != null and billingPersonAccount != ''">billing_person_account,</if>
-            <if test="jobNature != null and jobNature != ''">job_nature,</if>
+            <if test="jobNature != null">job_nature,</if>
             <if test="entryTime != null">entry_time,</if>
             <if test="vlgOrCmty != null">vlg_or_cmty,</if>
             <if test="urbRurCls != null">urb_rur_cls,</if>
@@ -196,8 +198,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="visitLatitude != null">visit_latitude,</if>
             <if test="fieldPhotoFile != null">field_photo_file,</if>
             <if test="attachmentFile != null">attachment_file,</if>
-            <if test="statusCode != null">status_code,</if>
-            <if test="statusName != null">status_name,</if>
             <if test="remark != null">remark,</if>
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
@@ -205,7 +205,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null and updateBy != ''">update_by,</if>
             <if test="defFlag != null and defFlag != ''">def_flag,</if>
             <if test="ticketType != null and ticketType != ''">ticket_type,</if>
-         </trim>
+            <if test="publishStatus != null">publish_status,</if>
+            <if test="modificationStatus != null">modification_status,</if>
+            <if test="statusNodeName != null">status_node_name,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="ticketNumber != null and ticketNumber != ''">#{ticketNumber},</if>
@@ -217,7 +220,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="billingPersonId != null">#{billingPersonId},</if>
             <if test="billingPersonName != null and billingPersonName != ''">#{billingPersonName},</if>
             <if test="billingPersonAccount != null and billingPersonAccount != ''">#{billingPersonAccount},</if>
-            <if test="jobNature != null and jobNature != ''">#{jobNature},</if>
+            <if test="jobNature != null">#{jobNature},</if>
             <if test="entryTime != null">#{entryTime},</if>
             <if test="vlgOrCmty != null">#{vlgOrCmty},</if>
             <if test="urbRurCls != null">#{urbRurCls},</if>
@@ -260,8 +263,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="visitLatitude != null">#{visitLatitude},</if>
             <if test="fieldPhotoFile != null">#{fieldPhotoFile},</if>
             <if test="attachmentFile != null">#{attachmentFile},</if>
-            <if test="statusCode != null">#{statusCode},</if>
-            <if test="statusName != null">#{statusName},</if>
             <if test="remark != null">#{remark},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
@@ -269,7 +270,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
             <if test="defFlag != null and defFlag != ''">#{defFlag},</if>
             <if test="ticketType != null and ticketType != ''">#{ticketType},</if>
-         </trim>
+            <if test="publishStatus != null">#{publishStatus},</if>
+            <if test="modificationStatus != null">#{modificationStatus},</if>
+            <if test="statusNodeName != null">#{statusNodeName},</if>
+        </trim>
     </insert>
 
     <update id="updateMcVisit" parameterType="com.chinagas.modules.schsf.domain.McVisit">
@@ -284,7 +288,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="billingPersonId != null">billing_person_id = #{billingPersonId},</if>
             <if test="billingPersonName != null and billingPersonName != ''">billing_person_name = #{billingPersonName},</if>
             <if test="billingPersonAccount != null and billingPersonAccount != ''">billing_person_account = #{billingPersonAccount},</if>
-            <if test="jobNature != null and jobNature != ''">job_nature = #{jobNature},</if>
+            <if test="jobNature != null">job_nature = #{jobNature},</if>
             <if test="entryTime != null">entry_time = #{entryTime},</if>
             <if test="vlgOrCmty != null">vlg_or_cmty = #{vlgOrCmty},</if>
             <if test="urbRurCls != null">urb_rur_cls = #{urbRurCls},</if>
@@ -327,8 +331,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="visitLatitude != null">visit_latitude = #{visitLatitude},</if>
             <if test="fieldPhotoFile != null">field_photo_file = #{fieldPhotoFile},</if>
             <if test="attachmentFile != null">attachment_file = #{attachmentFile},</if>
-            <if test="statusCode != null">status_code = #{statusCode},</if>
-            <if test="statusName != null">status_name = #{statusName},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
@@ -336,6 +338,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="defFlag != null and defFlag != ''">def_flag = #{defFlag},</if>
             <if test="ticketType != null and ticketType != ''">ticket_type = #{ticketType},</if>
+            <if test="publishStatus != null">publish_status = #{publishStatus},</if>
+            <if test="modificationStatus != null">modification_status = #{modificationStatus},</if>
+            <if test="statusNodeName != null">status_node_name = #{statusNodeName},</if>
         </trim>
         where id = #{id}
     </update>
--
libgit2 0.21.2