陈威 / MarketBasedPricingProgram

Download as
Browse Code »

Commit e7f45cef8c059c944b474b03c34a740a07b1d940

Authored by 陈威
1 parent 3252e438
Exists in dev

1： 添加收费记录 

2： 添加拜访记录
3： 点火
Showing 6 changed files with 158 additions and 113 deletions   Show diff stats
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McVisit.java
  Diff comments   View file @e7f45ce
... ... @@ -246,13 +246,13 @@ public class McVisit extends BaseEntity
246 246 @ExcelProperty(value = "附件(文件id，逗号分隔)")
247 247 private String attachmentFile;
248 248  
249   - /** 状态代码 */
250   - @ExcelProperty(value = "状态代码")
251   - private String statusCode;
252   -
253   - /** 状态名称 */
254   - @ExcelProperty(value = "状态名称")
255   - private String statusName;
  249 +// /** 状态代码 */
  250 +// @ExcelProperty(value = "状态代码")
  251 +// private String statusCode;
  252 +//
  253 +// /** 状态名称 */
  254 +// @ExcelProperty(value = "状态名称")
  255 +// private String statusName;
256 256  
257 257 /** 删除标志（0：未删除，1：已删除） */
258 258 @ExcelProperty(value = "删除标志")
... ... @@ -262,6 +262,13 @@ public class McVisit extends BaseEntity
262 262 @ExcelProperty(value = "工单类型")
263 263 private String ticketType;
264 264  
  265 + /** 发布状态 */
  266 + private String publishStatus;
  267 + /** 修改状态 */
  268 + private String modificationStatus;
  269 + /** 状态节点名称 */
  270 + private String statusNodeName;
  271 +
265 272 public void setId(Long id)
266 273 {
267 274 this.id = id;
... ... @@ -739,24 +746,24 @@ public class McVisit extends BaseEntity
739 746 {
740 747 return attachmentFile;
741 748 }
742   - public void setStatusCode(String statusCode)
743   - {
744   - this.statusCode = statusCode;
745   - }
746   -
747   - public String getStatusCode()
748   - {
749   - return statusCode;
750   - }
751   - public void setStatusName(String statusName)
752   - {
753   - this.statusName = statusName;
754   - }
755   -
756   - public String getStatusName()
757   - {
758   - return statusName;
759   - }
  749 +// public void setStatusCode(String statusCode)
  750 +// {
  751 +// this.statusCode = statusCode;
  752 +// }
  753 +//
  754 +// public String getStatusCode()
  755 +// {
  756 +// return statusCode;
  757 +// }
  758 +// public void setStatusName(String statusName)
  759 +// {
  760 +// this.statusName = statusName;
  761 +// }
  762 +//
  763 +// public String getStatusName()
  764 +// {
  765 +// return statusName;
  766 +// }
760 767 public void setDefFlag(String defFlag)
761 768 {
762 769 this.defFlag = defFlag;
... ... @@ -776,71 +783,28 @@ public class McVisit extends BaseEntity
776 783 return ticketType;
777 784 }
778 785  
779   - @Override
780   - public String toString() {
781   - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
782   - .append("id", getId())
783   - .append("ticketNumber", getTicketNumber())
784   - .append("fiscalYear", getFiscalYear())
785   - .append("regionName", getRegionName())
786   - .append("groupName", getGroupName())
787   - .append("companyName", getCompanyName())
788   - .append("companyCode", getCompanyCode())
789   - .append("billingPersonId", getBillingPersonId())
790   - .append("billingPersonName", getBillingPersonName())
791   - .append("billingPersonAccount", getBillingPersonAccount())
792   - .append("jobNature", getJobNature())
793   - .append("entryTime", getEntryTime())
794   - .append("vlgOrCmty", getVlgOrCmty())
795   - .append("urbRurCls", getUrbRurCls())
796   - .append("userName", getUserName())
797   - .append("userPhone", getUserPhone())
798   - .append("userProvince", getUserProvince())
799   - .append("userCity", getUserCity())
800   - .append("userDistrict", getUserDistrict())
801   - .append("userStreet", getUserStreet())
802   - .append("userDetailedAddress", getUserDetailedAddress())
803   - .append("hasDm", getHasDm())
804   - .append("dmAge", getDmAge())
805   - .append("dmIncomeSrc", getDmIncomeSrc())
806   - .append("dmPhone", getDmPhone())
807   - .append("isCharged", getIsCharged())
808   - .append("userCode", getUserCode())
809   - .append("userIdCard", getUserIdCard())
810   - .append("invoiceNo", getInvoiceNo())
811   - .append("chargeAmt", getChargeAmt())
812   - .append("paymentMeth", getPaymentMeth())
813   - .append("chargeType", getChargeType())
814   - .append("isVisited", getIsVisited())
815   - .append("isIntent", getIsIntent())
816   - .append("houseCondition", getHouseCondition())
817   - .append("currentCookingEnergy", getCurrentCookingEnergy())
818   - .append("currentHeatingEnergy", getCurrentHeatingEnergy())
819   - .append("familyMembers", getFamilyMembers())
820   - .append("fridgeStatus", getFridgeStatus())
821   - .append("acStatus", getAcStatus())
822   - .append("tvStatus", getTvStatus())
823   - .append("washerStatus", getWasherStatus())
824   - .append("waterHeaterStatus", getWaterHeaterStatus())
825   - .append("pvSystemStatus", getPvSystemStatus())
826   - .append("visitProvince", getVisitProvince())
827   - .append("visitCity", getVisitCity())
828   - .append("visitDistrict", getVisitDistrict())
829   - .append("visitStreet", getVisitStreet())
830   - .append("visitDetailedAddress", getVisitDetailedAddress())
831   - .append("visitLongitude", getVisitLongitude())
832   - .append("visitLatitude", getVisitLatitude())
833   - .append("fieldPhotoFile", getFieldPhotoFile())
834   - .append("attachmentFile", getAttachmentFile())
835   - .append("statusCode", getStatusCode())
836   - .append("statusName", getStatusName())
837   - .append("remark", getRemark())
838   - .append("createTime", getCreateTime())
839   - .append("createBy", getCreateBy())
840   - .append("updateTime", getUpdateTime())
841   - .append("updateBy", getUpdateBy())
842   - .append("defFlag", getDefFlag())
843   - .append("ticketType", getTicketType())
844   - .toString();
  786 +
  787 + public String getPublishStatus() {
  788 + return publishStatus;
  789 + }
  790 +
  791 + public void setPublishStatus(String publishStatus) {
  792 + this.publishStatus = publishStatus;
  793 + }
  794 +
  795 + public String getModificationStatus() {
  796 + return modificationStatus;
  797 + }
  798 +
  799 + public void setModificationStatus(String modificationStatus) {
  800 + this.modificationStatus = modificationStatus;
  801 + }
  802 +
  803 + public String getStatusNodeName() {
  804 + return statusNodeName;
  805 + }
  806 +
  807 + public void setStatusNodeName(String statusNodeName) {
  808 + this.statusNodeName = statusNodeName;
845 809 }
846 810 }
... ...
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/enums/VisitModificationStatusEnums.java 0 → 100644
  Diff comments   View file @e7f45ce
... ... @@ -0,0 +1,27 @@
  1 +package com.chinagas.modules.schsf.enums;
  2 +
  3 +/**
  4 + * 拜访-修改状态
  5 + */
  6 +public enum VisitModificationStatusEnums {
  7 +
  8 + REJECTED("REJECTED", "驳回"),
  9 + APPROVED("APPROVED", "通过"),
  10 + PENDING_LEVEL_1_AUDIT("PENDING_LEVEL_1_AUDIT", "待一级审核"),
  11 + PENDING_LEVEL_2_AUDIT("PENDING_LEVEL_2_AUDIT", "待二级审核");
  12 +
  13 + private final String code;
  14 + private final String info;
  15 +
  16 +
  17 + public String getCode() {
  18 + return code;
  19 + }
  20 + public String getInfo() {
  21 + return info;
  22 + }
  23 + VisitModificationStatusEnums(String code, String info) {
  24 + this.code = code;
  25 + this.info = info;
  26 + }
  27 +}
... ...
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/enums/VisitPublishStatusEnums.java 0 → 100644
  Diff comments   View file @e7f45ce
... ... @@ -0,0 +1,31 @@
  1 +package com.chinagas.modules.schsf.enums;
  2 +
  3 +/**
  4 + * 拜访-发布状态
  5 + */
  6 +public enum VisitPublishStatusEnums {
  7 +
  8 +
  9 + REJECTED("REJECTED", "驳回"),
  10 + APPROVED("APPROVED", "通过"),
  11 + PENDING_LEVEL_1_AUDIT("PENDING_LEVEL_1_AUDIT", "待一级审核"),
  12 + PENDING_LEVEL_2_AUDIT("PENDING_LEVEL_2_AUDIT", "待二级审核");
  13 +
  14 + private final String code;
  15 + private final String info;
  16 +
  17 +
  18 + public String getCode() {
  19 + return code;
  20 + }
  21 +
  22 + public String getInfo() {
  23 + return info;
  24 + }
  25 +
  26 + VisitPublishStatusEnums(String code, String info) {
  27 + this.code = code;
  28 + this.info = info;
  29 + }
  30 +
  31 +}
... ...
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McIgnitionServiceImpl.java
  Diff comments   View file @e7f45ce
... ... @@ -2,8 +2,10 @@ package com.chinagas.modules.schsf.service.impl;
2 2  
3 3 import com.alibaba.fastjson2.JSON;
4 4 import com.chinagas.common.core.utils.DateUtils;
  5 +import com.chinagas.common.core.utils.StringUtils;
5 6 import com.chinagas.modules.schsf.domain.McIgnition;
6 7 import com.chinagas.modules.schsf.domain.McVisit;
  8 +import com.chinagas.modules.schsf.enums.YesNoEnums;
7 9 import com.chinagas.modules.schsf.mapper.McIgnitionMapper;
8 10 import com.chinagas.modules.schsf.service.IMcIgnitionService;
9 11 import com.chinagas.modules.schsf.service.IMcOperationLogService;
... ... @@ -33,6 +35,10 @@ public class McIgnitionServiceImpl implements IMcIgnitionService {
33 35 */
34 36 @Override
35 37 public int insertMcVisitByMcIgnition(McVisit mcVisit) {
  38 + if (StringUtils.isEmpty(mcVisit.getIsCharged()) || mcVisit.getIsCharged().equals(YesNoEnums.NO.getCode())) {
  39 + return 0;
  40 + }
  41 +
36 42 McIgnition mcIgnition = new McIgnition();
37 43 mcIgnition.setRegionName(mcVisit.getRegionName());
38 44 mcIgnition.setGroupName(mcVisit.getGroupName());
... ... @@ -45,7 +51,9 @@ public class McIgnitionServiceImpl implements IMcIgnitionService {
45 51 mcIgnition.setUserStreet(mcVisit.getUserStreet());
46 52 mcIgnition.setVlgOrCmty(mcVisit.getVlgOrCmty());
47 53 List<McIgnition> mcIgnitions = mcIgnitionMapper.selectMcIgnitionParamList(mcIgnition);
48   - if (!mcIgnitions.isEmpty()) {return 0;}
  54 + if (!mcIgnitions.isEmpty()) {
  55 + return 0;
  56 + }
49 57  
50 58 mcIgnition.setVisitId(mcVisit.getId());
51 59 mcIgnition.setUrbRurCls(mcVisit.getUrbRurCls());
... ...
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java
  Diff comments   View file @e7f45ce
... ... @@ -6,6 +6,7 @@ import com.chinagas.common.core.utils.StringUtils;
6 6 import com.chinagas.common.security.utils.SecurityUtils;
7 7 import com.chinagas.modules.schsf.domain.McOperationLog;
8 8 import com.chinagas.modules.schsf.domain.McVisit;
  9 +import com.chinagas.modules.schsf.enums.VisitPublishStatusEnums;
9 10 import com.chinagas.modules.schsf.enums.VisitTypeEnums;
10 11 import com.chinagas.modules.schsf.enums.YesNoEnums;
11 12 import com.chinagas.modules.schsf.mapper.McVisitMapper;
... ... @@ -65,6 +66,12 @@ public class McVisitServiceImpl implements IMcVisitService {
65 66 * @param mcVisit 拜访工单
66 67 * @return 结果
67 68 */
  69 +
  70 +
  71 +// 驳回: REJECTED
  72 +// 通过: APPROVED
  73 +// 待一级审核: PENDING_LEVEL_1_AUDIT
  74 +// 待二级审核: PENDING_LEVEL_2_AUDIT
68 75 @Override
69 76 public int insertMcVisit(McVisit mcVisit) {
70 77 mcVisit.setIsCharged(StringUtils.nvl(mcVisit.getIsCharged(), YesNoEnums.NO.getCode()));
... ... @@ -81,13 +88,16 @@ public class McVisitServiceImpl implements IMcVisitService {
81 88 mcVisit.setTicketNumber(getTicketNumber());
82 89 //工单类型
83 90 mcVisit.setTicketType(getTicketType(mcVisit.getIsCharged(), mcVisit.getIsVisited()));
  91 + //状态
  92 + mcVisit.setPublishStatus(mcVisit.getIsCharged().equals(YesNoEnums.YES.getCode())? VisitPublishStatusEnums.PENDING_LEVEL_1_AUDIT.getCode():VisitPublishStatusEnums.APPROVED.getCode());
  93 + mcVisit.setModificationStatus(null);
84 94 int id = mcVisitMapper.insertMcVisit(mcVisit);
85 95 //1:添加记录
86 96 iMcOperationLogService.insertMcOperationLog("mc_visit", mcVisit.getId(), "项目公司_收费员",
87 97 mcVisit.getBillingPersonName(), mcVisit.getBillingPersonAccount(), mcVisit.getCreateTime(),
88 98 "发起", "1", null, null, JSON.toJSONString(mcVisit));
89   - //2：判断是否需要添加至点火记录
90   - iMcIgnitionService.insertMcVisitByMcIgnition(mcVisit);
  99 +// //2：判断是否需要添加至点火记录
  100 +// iMcIgnitionService.insertMcVisitByMcIgnition(mcVisit);
91 101 return id;
92 102  
93 103 }
... ...
zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml
  Diff comments   View file @e7f45ce
1 1 <?xml version="1.0" encoding="UTF-8" ?>
2 2 <!DOCTYPE mapper
3   -PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
4   -"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  4 + "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
5 5 <mapper namespace="com.chinagas.modules.schsf.mapper.McVisitMapper">
6 6  
7 7 <resultMap type="com.chinagas.modules.schsf.domain.McVisit" id="McVisitResult">
... ... @@ -58,8 +58,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
58 58 <result property="visitLatitude" column="visit_latitude" />
59 59 <result property="fieldPhotoFile" column="field_photo_file" />
60 60 <result property="attachmentFile" column="attachment_file" />
61   - <result property="statusCode" column="status_code" />
62   - <result property="statusName" column="status_name" />
63 61 <result property="remark" column="remark" />
64 62 <result property="createTime" column="create_time" />
65 63 <result property="createBy" column="create_by" />
... ... @@ -67,10 +65,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
67 65 <result property="updateBy" column="update_by" />
68 66 <result property="defFlag" column="def_flag" />
69 67 <result property="ticketType" column="ticket_type" />
  68 + <result property="publishStatus" column="publish_status" />
  69 + <result property="modificationStatus" column="modification_status" />
  70 + <result property="statusNodeName" column="status_node_name" />
70 71 </resultMap>
71 72  
72 73 <sql id="selectMcVisitVo">
73   - 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
  74 + 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
74 75 </sql>
75 76  
76 77 <select id="selectMcVisitList" parameterType="com.chinagas.modules.schsf.domain.McVisit" resultMap="McVisitResult">
... ... @@ -128,10 +129,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
128 129 <if test="visitLatitude != null "> and visit_latitude = #{visitLatitude}</if>
129 130 <if test="fieldPhotoFile != null and fieldPhotoFile != ''"> and field_photo_file = #{fieldPhotoFile}</if>
130 131 <if test="attachmentFile != null and attachmentFile != ''"> and attachment_file = #{attachmentFile}</if>
131   - <if test="statusCode != null and statusCode != ''"> and status_code = #{statusCode}</if>
132   - <if test="statusName != null and statusName != ''"> and status_name like concat('%', #{statusName}, '%')</if>
133 132 <if test="defFlag != null and defFlag != ''"> and def_flag = #{defFlag}</if>
134 133 <if test="ticketType != null and ticketType != ''"> and ticket_type = #{ticketType}</if>
  134 + <if test="publishStatus != null and publishStatus != ''"> and publish_status = #{publishStatus}</if>
  135 + <if test="modificationStatus != null and modificationStatus != ''"> and modification_status = #{modificationStatus}</if>
  136 + <if test="statusNodeName != null and statusNodeName != ''"> and status_node_name like concat('%', #{statusNodeName}, '%')</if>
135 137 </where>
136 138 </select>
137 139  
... ... @@ -140,7 +142,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
140 142 where id = #{id}
141 143 </select>
142 144  
143   - <insert id="insertMcVisit" parameterType="com.chinagas.modules.schsf.domain.McVisit" useGeneratedKeys="true" keyProperty="id">
  145 + <insert id="insertMcVisit" parameterType="com.chinagas.modules.schsf.domain.McVisit" useGeneratedKeys="true" keyProperty="id">
144 146 insert into mc_visit
145 147 <trim prefix="(" suffix=")" suffixOverrides=",">
146 148 <if test="id != null">id,</if>
... ... @@ -153,7 +155,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
153 155 <if test="billingPersonId != null">billing_person_id,</if>
154 156 <if test="billingPersonName != null and billingPersonName != ''">billing_person_name,</if>
155 157 <if test="billingPersonAccount != null and billingPersonAccount != ''">billing_person_account,</if>
156   - <if test="jobNature != null and jobNature != ''">job_nature,</if>
  158 + <if test="jobNature != null">job_nature,</if>
157 159 <if test="entryTime != null">entry_time,</if>
158 160 <if test="vlgOrCmty != null">vlg_or_cmty,</if>
159 161 <if test="urbRurCls != null">urb_rur_cls,</if>
... ... @@ -196,8 +198,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
196 198 <if test="visitLatitude != null">visit_latitude,</if>
197 199 <if test="fieldPhotoFile != null">field_photo_file,</if>
198 200 <if test="attachmentFile != null">attachment_file,</if>
199   - <if test="statusCode != null">status_code,</if>
200   - <if test="statusName != null">status_name,</if>
201 201 <if test="remark != null">remark,</if>
202 202 <if test="createTime != null">create_time,</if>
203 203 <if test="createBy != null and createBy != ''">create_by,</if>
... ... @@ -205,7 +205,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
205 205 <if test="updateBy != null and updateBy != ''">update_by,</if>
206 206 <if test="defFlag != null and defFlag != ''">def_flag,</if>
207 207 <if test="ticketType != null and ticketType != ''">ticket_type,</if>
208   - </trim>
  208 + <if test="publishStatus != null">publish_status,</if>
  209 + <if test="modificationStatus != null">modification_status,</if>
  210 + <if test="statusNodeName != null">status_node_name,</if>
  211 + </trim>
209 212 <trim prefix="values (" suffix=")" suffixOverrides=",">
210 213 <if test="id != null">#{id},</if>
211 214 <if test="ticketNumber != null and ticketNumber != ''">#{ticketNumber},</if>
... ... @@ -217,7 +220,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
217 220 <if test="billingPersonId != null">#{billingPersonId},</if>
218 221 <if test="billingPersonName != null and billingPersonName != ''">#{billingPersonName},</if>
219 222 <if test="billingPersonAccount != null and billingPersonAccount != ''">#{billingPersonAccount},</if>
220   - <if test="jobNature != null and jobNature != ''">#{jobNature},</if>
  223 + <if test="jobNature != null">#{jobNature},</if>
221 224 <if test="entryTime != null">#{entryTime},</if>
222 225 <if test="vlgOrCmty != null">#{vlgOrCmty},</if>
223 226 <if test="urbRurCls != null">#{urbRurCls},</if>
... ... @@ -260,8 +263,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
260 263 <if test="visitLatitude != null">#{visitLatitude},</if>
261 264 <if test="fieldPhotoFile != null">#{fieldPhotoFile},</if>
262 265 <if test="attachmentFile != null">#{attachmentFile},</if>
263   - <if test="statusCode != null">#{statusCode},</if>
264   - <if test="statusName != null">#{statusName},</if>
265 266 <if test="remark != null">#{remark},</if>
266 267 <if test="createTime != null">#{createTime},</if>
267 268 <if test="createBy != null and createBy != ''">#{createBy},</if>
... ... @@ -269,7 +270,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
269 270 <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
270 271 <if test="defFlag != null and defFlag != ''">#{defFlag},</if>
271 272 <if test="ticketType != null and ticketType != ''">#{ticketType},</if>
272   - </trim>
  273 + <if test="publishStatus != null">#{publishStatus},</if>
  274 + <if test="modificationStatus != null">#{modificationStatus},</if>
  275 + <if test="statusNodeName != null">#{statusNodeName},</if>
  276 + </trim>
273 277 </insert>
274 278  
275 279 <update id="updateMcVisit" parameterType="com.chinagas.modules.schsf.domain.McVisit">
... ... @@ -284,7 +288,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
284 288 <if test="billingPersonId != null">billing_person_id = #{billingPersonId},</if>
285 289 <if test="billingPersonName != null and billingPersonName != ''">billing_person_name = #{billingPersonName},</if>
286 290 <if test="billingPersonAccount != null and billingPersonAccount != ''">billing_person_account = #{billingPersonAccount},</if>
287   - <if test="jobNature != null and jobNature != ''">job_nature = #{jobNature},</if>
  291 + <if test="jobNature != null">job_nature = #{jobNature},</if>
288 292 <if test="entryTime != null">entry_time = #{entryTime},</if>
289 293 <if test="vlgOrCmty != null">vlg_or_cmty = #{vlgOrCmty},</if>
290 294 <if test="urbRurCls != null">urb_rur_cls = #{urbRurCls},</if>
... ... @@ -327,8 +331,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
327 331 <if test="visitLatitude != null">visit_latitude = #{visitLatitude},</if>
328 332 <if test="fieldPhotoFile != null">field_photo_file = #{fieldPhotoFile},</if>
329 333 <if test="attachmentFile != null">attachment_file = #{attachmentFile},</if>
330   - <if test="statusCode != null">status_code = #{statusCode},</if>
331   - <if test="statusName != null">status_name = #{statusName},</if>
332 334 <if test="remark != null">remark = #{remark},</if>
333 335 <if test="createTime != null">create_time = #{createTime},</if>
334 336 <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
... ... @@ -336,6 +338,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
336 338 <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
337 339 <if test="defFlag != null and defFlag != ''">def_flag = #{defFlag},</if>
338 340 <if test="ticketType != null and ticketType != ''">ticket_type = #{ticketType},</if>
  341 + <if test="publishStatus != null">publish_status = #{publishStatus},</if>
  342 + <if test="modificationStatus != null">modification_status = #{modificationStatus},</if>
  343 + <if test="statusNodeName != null">status_node_name = #{statusNodeName},</if>
339 344 </trim>
340 345 where id = #{id}
341 346 </update>
... ...