新增 V2版本项目申报

ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/ZsyzQyxx.java

@@ -42,9 +42,9 @@ public class ZsyzQyxx extends BaseEntity
     @Excel(name = "我方签约人")
     private String wfqyr;
 
-    /** 通报日期 */
+    /** 填报日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "通报日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "填报日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date tbrq;
 
     /** 签约日期 */
@@ -64,9 +64,15 @@ public class ZsyzQyxx extends BaseEntity
     @Excel(name = "固定资产投资额", readConverterExp = "万=元")
     private String gdzctze;
 
+    /** 项目跟进人姓名 */
+    @Excel(name = "项目跟进人姓名")
+    private String xmgjrxm;
+    /** 项目跟进人职务 */
+    @Excel(name = "项目跟进人职务")
+    private String xmgjrzw;
     /** 签约跟进人手机号 */
     @Excel(name = "签约跟进人手机号")
-    private String qygjrsjh;
+    private String xmgjrsjh;
 
     /** 项目所在地 */
     @Excel(name = "项目所在地")
@@ -92,9 +98,15 @@ public class ZsyzQyxx extends BaseEntity
     @Excel(name = "建设内容")
     private String jsnr;
 
-    /** 用地面积（亩） */
-    @Excel(name = "用地面积", readConverterExp = "亩=")
-    private String ydmj;
+    /** 租赁厂房(平方米) */
+    @Excel(name = "租赁厂房(平方米)", readConverterExp = "亩=")
+    private String zlcf;
+
+    /**
+     * 供地面积(亩)
+     */
+    @Excel(name = "供地面积(亩)")
+    private String gdmj;
 
     /** 注册企业名称 */
     @Excel(name = "注册企业名称")
@@ -138,7 +150,47 @@ public class ZsyzQyxx extends BaseEntity
     /** 附件集合 */
     private List<ZsyzFj> zsyzFjList;
 
-    public void setId(Long id) 
+    public String getXmgjrxm() {
+        return xmgjrxm;
+    }
+
+    public void setXmgjrxm(String xmgjrxm) {
+        this.xmgjrxm = xmgjrxm;
+    }
+
+    public String getXmgjrzw() {
+        return xmgjrzw;
+    }
+
+    public void setXmgjrzw(String xmgjrzw) {
+        this.xmgjrzw = xmgjrzw;
+    }
+
+    public String getXmgjrsjh() {
+        return xmgjrsjh;
+    }
+
+    public void setXmgjrsjh(String xmgjrsjh) {
+        this.xmgjrsjh = xmgjrsjh;
+    }
+
+    public String getZlcf() {
+        return zlcf;
+    }
+
+    public void setZlcf(String zlcf) {
+        this.zlcf = zlcf;
+    }
+
+    public String getGdmj() {
+        return gdmj;
+    }
+
+    public void setGdmj(String gdmj) {
+        this.gdmj = gdmj;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }
@@ -237,15 +289,7 @@ public class ZsyzQyxx extends BaseEntity
     {
         return gdzctze;
     }
-    public void setQygjrsjh(String qygjrsjh) 
-    {
-        this.qygjrsjh = qygjrsjh;
-    }
 
-    public String getQygjrsjh() 
-    {
-        return qygjrsjh;
-    }
     public void setXmszd(String xmszd) 
     {
         this.xmszd = xmszd;
@@ -300,15 +344,7 @@ public class ZsyzQyxx extends BaseEntity
     {
         return jsnr;
     }
-    public void setYdmj(String ydmj) 
-    {
-        this.ydmj = ydmj;
-    }
 
-    public String getYdmj() 
-    {
-        return ydmj;
-    }
     public void setZcqymc(String zcqymc) 
     {
         this.zcqymc = zcqymc;
@@ -401,40 +437,39 @@ public class ZsyzQyxx extends BaseEntity
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("xmId", getXmId())
-            .append("xmbh", getXmbh())
-            .append("xmmc", getXmmc())
-            .append("dfqyr", getDfqyr())
-            .append("wfqyr", getWfqyr())
-            .append("tbrq", getTbrq())
-            .append("qyrq", getQyrq())
-            .append("xytze", getXytze())
-            .append("swzj", getSwzj())
-            .append("gdzctze", getGdzctze())
-            .append("qygjrsjh", getQygjrsjh())
-            .append("xmszd", getXmszd())
-            .append("sshy", getSshy())
-            .append("tzfs", getTzfs())
-            .append("jsfs", getJsfs())
-            .append("sfys", getSfys())
-            .append("jsnr", getJsnr())
-            .append("ydmj", getYdmj())
-            .append("zcqymc", getZcqymc())
-            .append("zcrq", getZcrq())
-            .append("zczb", getZczb())
-            .append("frdb", getFrdb())
-            .append("lxfs", getLxfs())
-            .append("jyfw", getJyfw())
-            .append("lxrq", getLxrq())
-            .append("nkgrq", getNkgrq())
-            .append("path", getPath())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return "ZsyzQyxx{" +
+                "id=" + id +
+                ", xmId=" + xmId +
+                ", xmbh='" + xmbh + '\'' +
+                ", xmmc='" + xmmc + '\'' +
+                ", dfqyr='" + dfqyr + '\'' +
+                ", wfqyr='" + wfqyr + '\'' +
+                ", tbrq=" + tbrq +
+                ", qyrq=" + qyrq +
+                ", xytze='" + xytze + '\'' +
+                ", swzj='" + swzj + '\'' +
+                ", gdzctze='" + gdzctze + '\'' +
+                ", xmgjrxm='" + xmgjrxm + '\'' +
+                ", xmgjrzw='" + xmgjrzw + '\'' +
+                ", xmgjrsjh='" + xmgjrsjh + '\'' +
+                ", xmszd='" + xmszd + '\'' +
+                ", sshy='" + sshy + '\'' +
+                ", tzfs='" + tzfs + '\'' +
+                ", jsfs='" + jsfs + '\'' +
+                ", sfys='" + sfys + '\'' +
+                ", jsnr='" + jsnr + '\'' +
+                ", zlcf='" + zlcf + '\'' +
+                ", gdmj='" + gdmj + '\'' +
+                ", zcqymc='" + zcqymc + '\'' +
+                ", zcrq=" + zcrq +
+                ", zczb='" + zczb + '\'' +
+                ", frdb='" + frdb + '\'' +
+                ", lxfs='" + lxfs + '\'' +
+                ", jyfw='" + jyfw + '\'' +
+                ", lxrq=" + lxrq +
+                ", nkgrq=" + nkgrq +
+                ", path='" + path + '\'' +
+                ", zsyzFjList=" + zsyzFjList +
+                '}';
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/ZsyzShyj.java

@@ -1,10 +1,13 @@
 package com.ruoyi.system.domain.projectV2;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import javax.xml.crypto.Data;
+
 /**
  * 招商引资_审核意见对象 zsyz_shyj
  * 
@@ -25,6 +28,11 @@ public class ZsyzShyj extends BaseEntity
     /** 项目编号 */
     @Excel(name = "项目编号")
     private String xmbh;
+    /**
+     * 项目名称
+     */
+    @Excel(name = "项目名称")
+    private String xmmc;
 
     /** 审核人id */
     @Excel(name = "审核人id 部门id")
@@ -48,9 +56,18 @@ public class ZsyzShyj extends BaseEntity
 
     /** 审核时间 */
     @Excel(name = "审核时间")
-    private String shsj;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Data shsj;
+
+    public String getXmmc() {
+        return xmmc;
+    }
 
-    public void setId(Long id) 
+    public void setXmmc(String xmmc) {
+        this.xmmc = xmmc;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }
@@ -122,16 +139,15 @@ public class ZsyzShyj extends BaseEntity
     {
         return shyj;
     }
-    public void setShsj(String shsj) 
-    {
-        this.shsj = shsj;
-    }
 
-    public String getShsj() 
-    {
+    public Data getShsj() {
         return shsj;
     }
 
+    public void setShsj(Data shsj) {
+        this.shsj = shsj;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -149,6 +165,7 @@ public class ZsyzShyj extends BaseEntity
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
+            .append("xmmc", getXmmc())
             .toString();
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/ZsyzKgxxServiceImpl.java

@@ -42,7 +42,9 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService
         ZsyzFj zsyzFj = new ZsyzFj();
         zsyzFj.setSourceId(id);
         List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
-        zsyzKgxx.setZsyzFjList(zsyzFjList);
+        if (zsyzFjList != null && zsyzFjList.size() > 0){
+            zsyzKgxx.setZsyzFjList(zsyzFjList);
+        }
         return zsyzKgxx;
 
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/ZsyzQyxxServiceImpl.java

@@ -41,7 +41,9 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService
         ZsyzFj zsyzFj = new ZsyzFj();
         zsyzFj.setSourceId(id);
         List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
-        zsyzQyxx.setZsyzFjList(zsyzFjList);
+        if (zsyzFjList != null && zsyzFjList.size() > 0){
+            zsyzQyxx.setZsyzFjList(zsyzFjList);
+        }
         return zsyzQyxx;
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/ZsyzSbbzbServiceImpl.java

@@ -51,7 +51,9 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
         ZsyzFj zsyzFj = new ZsyzFj();
         zsyzFj.setSourceId(id);
         List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
-        zsyzSbbzb.setZsyzFjList(zsyzFjList);
+        if (zsyzFjList != null && zsyzFjList.size() > 0){
+            zsyzSbbzb.setZsyzFjList(zsyzFjList);
+        }
         return zsyzSbbzb;
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/ZsyzTcxxServiceImpl.java

@@ -44,7 +44,9 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService
         ZsyzFj zsyzFj = new ZsyzFj();
         zsyzFj.setSourceId(id);
         List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
-        zsyzTcxx.setZsyzFjList(zsyzFjList);
+        if (zsyzFjList != null && zsyzFjList.size() > 0){
+            zsyzTcxx.setZsyzFjList(zsyzFjList);
+        }
         return zsyzTcxx;
     }
 

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzQyxxMapper.xml

@@ -16,14 +16,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="xytze"    column="xytze"    />
         <result property="swzj"    column="swzj"    />
         <result property="gdzctze"    column="gdzctze"    />
-        <result property="qygjrsjh"    column="qygjrsjh"    />
+        <result property="xmgjrxm"    column="xmgjrxm"    />
+        <result property="xmgjrzw"    column="xmgjrzw"    />
+        <result property="xmgjrsjh"    column="xmgjrsjh"    />
         <result property="xmszd"    column="xmszd"    />
         <result property="sshy"    column="sshy"    />
         <result property="tzfs"    column="tzfs"    />
         <result property="jsfs"    column="jsfs"    />
         <result property="sfys"    column="sfys"    />
         <result property="jsnr"    column="jsnr"    />
-        <result property="ydmj"    column="ydmj"    />
+        <result property="zlcf"    column="zlcf"    />
+        <result property="gdmj"    column="gdmj"    />
         <result property="zcqymc"    column="zcqymc"    />
         <result property="zcrq"    column="zcrq"    />
         <result property="zczb"    column="zczb"    />
@@ -41,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectZsyzQyxxVo">
-        select id, xm_id, xmbh, xmmc, dfqyr, wfqyr, tbrq, qyrq, xytze, swzj, gdzctze, qygjrsjh, xmszd, sshy, tzfs, jsfs, sfys, jsnr, ydmj, zcqymc, zcrq, zczb, frdb, lxfs, jyfw, lxrq, nkgrq, path, create_by, create_time, update_by, update_time, remark from zsyz_qyxx
+        select id, xm_id, xmbh, xmmc, dfqyr, wfqyr, tbrq, qyrq, xytze, swzj, gdzctze, xmgjrxm,xmgjrzw,xmgjrsjh, xmszd, sshy, tzfs, jsfs, sfys, jsnr, zlcf,gdmj, zcqymc, zcrq, zczb, frdb, lxfs, jyfw, lxrq, nkgrq, path, create_by, create_time, update_by, update_time, remark from zsyz_qyxx
     </sql>
 
     <select id="selectZsyzQyxxList" parameterType="ZsyzQyxx" resultMap="ZsyzQyxxResult">
@@ -57,14 +60,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xytze != null  and xytze != ''"> and xytze = #{xytze}</if>
             <if test="swzj != null  and swzj != ''"> and swzj = #{swzj}</if>
             <if test="gdzctze != null  and gdzctze != ''"> and gdzctze = #{gdzctze}</if>
-            <if test="qygjrsjh != null  and qygjrsjh != ''"> and qygjrsjh = #{qygjrsjh}</if>
+            <if test="xmgjrxm != null  and xmgjrxm != ''"> and xmgjrxm = #{xmgjrxm}</if>
+            <if test="xmgjrzw != null  and xmgjrzw != ''"> and xmgjrzw = #{xmgjrzw}</if>
+            <if test="xmgjrsjh != null  and xmgjrsjh != ''"> and xmgjrsjh = #{xmgjrsjh}</if>
             <if test="xmszd != null  and xmszd != ''"> and xmszd = #{xmszd}</if>
             <if test="sshy != null  and sshy != ''"> and sshy = #{sshy}</if>
             <if test="tzfs != null  and tzfs != ''"> and tzfs = #{tzfs}</if>
             <if test="jsfs != null  and jsfs != ''"> and jsfs = #{jsfs}</if>
             <if test="sfys != null  and sfys != ''"> and sfys = #{sfys}</if>
             <if test="jsnr != null  and jsnr != ''"> and jsnr = #{jsnr}</if>
-            <if test="ydmj != null  and ydmj != ''"> and ydmj = #{ydmj}</if>
+            <if test="zlcf != null  and zlcf != ''"> and zlcf = #{zlcf}</if>
+            <if test="gdmj != null  and gdmj != ''"> and gdmj = #{gdmj}</if>
             <if test="zcqymc != null  and zcqymc != ''"> and zcqymc = #{zcqymc}</if>
             <if test="zcrq != null "> and zcrq = #{zcrq}</if>
             <if test="zczb != null  and zczb != ''"> and zczb = #{zczb}</if>
@@ -95,14 +101,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xytze != null and xytze != ''">xytze,</if>
             <if test="swzj != null">swzj,</if>
             <if test="gdzctze != null and gdzctze != ''">gdzctze,</if>
-            <if test="qygjrsjh != null and qygjrsjh != ''">qygjrsjh,</if>
+            <if test="xmgjrxm != null and xmgjrxm != ''">xmgjrxm,</if>
+            <if test="xmgjrzw != null and xmgjrzw != ''">xmgjrzw,</if>
+            <if test="xmgjrsjh != null and xmgjrsjh != ''">xmgjrsjh,</if>
             <if test="xmszd != null and xmszd != ''">xmszd,</if>
             <if test="sshy != null and sshy != ''">sshy,</if>
             <if test="tzfs != null and tzfs != ''">tzfs,</if>
             <if test="jsfs != null and jsfs != ''">jsfs,</if>
             <if test="sfys != null and sfys != ''">sfys,</if>
             <if test="jsnr != null and jsnr != ''">jsnr,</if>
-            <if test="ydmj != null and ydmj != ''">ydmj,</if>
+            <if test="zlcf != null and zlcf != ''">zlcf,</if>
+            <if test="gdmj != null and gdmj != ''">gdmj,</if>
             <if test="zcqymc != null and zcqymc != ''">zcqymc,</if>
             <if test="zcrq != null">zcrq,</if>
             <if test="zczb != null and zczb != ''">zczb,</if>
@@ -129,14 +138,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xytze != null and xytze != ''">#{xytze},</if>
             <if test="swzj != null">#{swzj},</if>
             <if test="gdzctze != null and gdzctze != ''">#{gdzctze},</if>
-            <if test="qygjrsjh != null and qygjrsjh != ''">#{qygjrsjh},</if>
+            <if test="xmgjrxm != null and xmgjrxm != ''">#{xmgjrxm},</if>
+            <if test="xmgjrzw != null and xmgjrzw != ''">#{xmgjrzw},</if>
+            <if test="xmgjrsjh != null and xmgjrsjh != ''">#{xmgjrsjh},</if>
             <if test="xmszd != null and xmszd != ''">#{xmszd},</if>
             <if test="sshy != null and sshy != ''">#{sshy},</if>
             <if test="tzfs != null and tzfs != ''">#{tzfs},</if>
             <if test="jsfs != null and jsfs != ''">#{jsfs},</if>
             <if test="sfys != null and sfys != ''">#{sfys},</if>
             <if test="jsnr != null and jsnr != ''">#{jsnr},</if>
-            <if test="ydmj != null and ydmj != ''">#{ydmj},</if>
+            <if test="zlcf != null and zlcf != ''">#{zlcf},</if>
+            <if test="gdmj != null and gdmj != ''">#{gdmj},</if>
             <if test="zcqymc != null and zcqymc != ''">#{zcqymc},</if>
             <if test="zcrq != null">#{zcrq},</if>
             <if test="zczb != null and zczb != ''">#{zczb},</if>
@@ -167,14 +179,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xytze != null and xytze != ''">xytze = #{xytze},</if>
             <if test="swzj != null">swzj = #{swzj},</if>
             <if test="gdzctze != null and gdzctze != ''">gdzctze = #{gdzctze},</if>
-            <if test="qygjrsjh != null and qygjrsjh != ''">qygjrsjh = #{qygjrsjh},</if>
+            <if test="xmgjrxm != null and xmgjrxm != ''">xmgjrxm = #{xmgjrxm},</if>
+            <if test="xmgjrzw != null and xmgjrzw != ''">xmgjrzw = #{xmgjrzw},</if>
+            <if test="xmgjrsjh != null and xmgjrsjh != ''">xmgjrsjh = #{xmgjrsjh},</if>
             <if test="xmszd != null and xmszd != ''">xmszd = #{xmszd},</if>
             <if test="sshy != null and sshy != ''">sshy = #{sshy},</if>
             <if test="tzfs != null and tzfs != ''">tzfs = #{tzfs},</if>
             <if test="jsfs != null and jsfs != ''">jsfs = #{jsfs},</if>
             <if test="sfys != null and sfys != ''">sfys = #{sfys},</if>
             <if test="jsnr != null and jsnr != ''">jsnr = #{jsnr},</if>
-            <if test="ydmj != null and ydmj != ''">ydmj = #{ydmj},</if>
+            <if test="zlcf != null and zlcf != ''">zlcf = #{zlcf},</if>
+            <if test="gdmj != null and gdmj != ''">gdmj = #{gdmj},</if>
             <if test="zcqymc != null and zcqymc != ''">zcqymc = #{zcqymc},</if>
             <if test="zcrq != null">zcrq = #{zcrq},</if>
             <if test="zczb != null and zczb != ''">zczb = #{zczb},</if>

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzShyjMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptId"    column="dept_id"    />
         <result property="shrxm"    column="shrxm"    />
         <result property="xmjd"    column="xmjd"    />
+        <result property="xmmc"    column="xmmc"    />
         <result property="shjg"    column="shjg"    />
         <result property="shyj"    column="shyj"    />
         <result property="shsj"    column="shsj"    />
@@ -22,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectZsyzShyjVo">
-        select id, xm_id, xmbh, dept_id, shrxm, xmjd, shjg, shyj, shsj, create_by, create_time, update_by, update_time, remark from zsyz_shyj
+        select id, xm_id, xmbh, dept_id, shrxm, xmjd,xmmc, shjg, shyj, shsj, create_by, create_time, update_by, update_time, remark from zsyz_shyj
     </sql>
 
     <select id="selectZsyzShyjList" parameterType="ZsyzShyj" resultMap="ZsyzShyjResult">
@@ -30,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="xmId != null "> and xm_id = #{xmId}</if>
             <if test="xmbh != null  and xmbh != ''"> and xmbh = #{xmbh}</if>
+            <if test="xmmc != null  and xmmc != ''"> and xmmc = #{xmmc}</if>
             <if test="shrxm != null  and shrxm != ''"> and shrxm = #{shrxm}</if>
             <if test="xmjd != null  and xmjd != ''"> and xmjd = #{xmjd}</if>
             <if test="shjg != null  and shjg != ''"> and shjg = #{shjg}</if>
@@ -50,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="xmId != null">xm_id,</if>
             <if test="xmbh != null">xmbh,</if>
+            <if test="xmmc != null">xmmc,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="shrxm != null and shrxm != ''">shrxm,</if>
             <if test="xmjd != null and xmjd != ''">xmjd,</if>
@@ -65,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="xmId != null">#{xmId},</if>
             <if test="xmbh != null">#{xmbh},</if>
+            <if test="xmmc != null and xmmc != ''">#{xmmc},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="shrxm != null and shrxm != ''">#{shrxm},</if>
             <if test="xmjd != null and xmjd != ''">#{xmjd},</if>
@@ -84,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="xmId != null">xm_id = #{xmId},</if>
             <if test="xmbh != null">xmbh = #{xmbh},</if>
+            <if test="xmmc != null and xmmc != ''">xmmc = #{xmmc},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="shrxm != null and shrxm != ''">shrxm = #{shrxm},</if>
             <if test="xmjd != null and xmjd != ''">xmjd = #{xmjd},</if>