新增进展情况

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

@@ -135,6 +135,10 @@ public class ZsyzSbbzb extends BaseEntity
     /** 项目简介 */
     @Excel(name = "项目简介", needMerge = true)
     private String xmjj;
+    /**
+     * 项目进展情况
+     */
+    private String xmjzqk;
 
     /** 首谈人 */
     @Excel(name = "首谈人", needMerge = true)
@@ -295,6 +299,14 @@ public class ZsyzSbbzb extends BaseEntity
      */
     private String czwt;
 
+    public String getXmjzqk() {
+        return xmjzqk;
+    }
+
+    public void setXmjzqk(String xmjzqk) {
+        this.xmjzqk = xmjzqk;
+    }
+
     public String getCzwt() {
         return czwt;
     }

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

@@ -34,6 +34,7 @@
         <result property="tzrzw" column="tzrzw"/>
         <result property="tzrdh" column="tzrdh"/>
         <result property="xmjj" column="xmjj"/>
+        <result property="xmjzqk" column="xmjzqk"/>
         <result property="name" column="name"/>
         <result property="strq" column="strq"/>
         <result property="phone" column="phone"/>
@@ -243,6 +244,7 @@
                tzrzw,
                tzrdh,
                xmjj,
+               xmjzqk,
                name,
                strq,
                phone,
@@ -270,7 +272,7 @@
         select s.id, s.sbdw, s.tbrq, s.zszxfzr, s.xmbh, s.xmxsmc, s.sfwlhxxxm, s.yzdq_id, s.yzdq_name, s.yzss_name,
         s.ntze, s.cylx_id, s.cylx_name, s.xmlb,
         s.tzlb, s.nlhd, s.czpt, s.tzzt, s.xmjz, s.gtzzrsfzhm, s.qytzrxyzdm, s.qybj, s.tzfjj, s.sndxse, s.sndnse,
-        s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, s.name,
+        s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj,s.xmjzqk, s.name,
         s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress,s.xm_status, s.dept_id, s.create_time, s.update_by,
         s.is_del, s.update_time, s.remark, s.cjd_id,
         s.cjd_name, s.is_meet, s.meet_remark,s.shjg,s.psnr,s.czwt,
@@ -353,7 +355,7 @@
         select s.id, s.sbdw, s.tbrq, s.zszxfzr, s.xmbh, s.xmxsmc, s.sfwlhxxxm, s.yzdq_id, s.yzdq_name, s.yzss_name,
         s.ntze, s.cylx_id, s.cylx_name, s.xmlb,
         s.tzlb, s.nlhd, s.czpt, s.tzzt, s.xmjz, s.gtzzrsfzhm, s.qytzrxyzdm, s.qybj, s.tzfjj, s.sndxse, s.sndnse,
-        s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, s.name,
+        s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj,s.xmjzqk, s.name,
         s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress,s.xm_status, s.dept_id, s.create_time, s.update_by,
         s.is_del, s.update_time, s.remark, s.cjd_id,
         s.cjd_name, s.is_meet, s.meet_remark,s.shjg,s.psnr,s.czwt,
@@ -436,7 +438,7 @@
                 select s.id, s.sbdw, s.tbrq, s.zszxfzr, s.xmbh, s.xmxsmc, s.sfwlhxxxm, s.yzdq_id, s.yzdq_name, s.yzss_name,
         s.ntze, s.cylx_id, s.cylx_name, s.xmlb,
         s.tzlb, s.nlhd, s.czpt, s.tzzt, s.xmjz, s.gtzzrsfzhm, s.qytzrxyzdm, s.qybj, s.tzfjj, s.sndxse, s.sndnse,
-        s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, s.name,
+        s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj,s.xmjzqk, s.name,
         s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress,s.xm_status, s.dept_id, s.create_time, s.update_by,
         s.is_del, s.update_time, s.remark, s.cjd_id,
         s.cjd_name, s.is_meet, s.meet_remark,s.shjg,s.psnr,s.czwt
@@ -448,7 +450,7 @@
         select s.id, s.sbdw, s.tbrq, s.zszxfzr, s.xmbh, s.xmxsmc, s.sfwlhxxxm, s.yzdq_id, s.yzdq_name, s.yzss_name,
         s.ntze, s.cylx_id, s.cylx_name, s.xmlb,
         s.tzlb, s.nlhd, s.czpt, s.tzzt, s.xmjz, s.gtzzrsfzhm, s.qytzrxyzdm, s.qybj, s.tzfjj, s.sndxse, s.sndnse,
-        s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, s.name,
+        s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj,s.xmjzqk, s.name,
         s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress,s.xm_status, s.dept_id, s.create_time, s.update_by,
         s.is_del, s.update_time, s.remark, s.cjd_id,
         s.cjd_name, s.is_meet, s.meet_remark,s.psnr,s.czwt,
@@ -558,7 +560,7 @@
         s.tzrxm,
         s.tzrzw,
         s.tzrdh,
-        s.xmjj,
+        s.xmjj,s.xmjzqk,
         s.name,
         s.strq,
         s.phone,
@@ -624,7 +626,7 @@
         s.tzrxm,
         s.tzrzw,
         s.tzrdh,
-        s.xmjj,
+        s.xmjj,s.xmjzqk,
         s.name,
         s.strq,
         s.phone,
@@ -693,7 +695,7 @@
         s.tzrxm,
         s.tzrzw,
         s.tzrdh,
-        s.xmjj,
+        s.xmjj,s.xmjzqk,
         s.name,
         s.strq,
         s.phone,
@@ -759,7 +761,7 @@
         s.tzrxm,
         s.tzrzw,
         s.tzrdh,
-        s.xmjj,
+        s.xmjj,s.xmjzqk,
         s.name,
         s.strq,
         s.phone,
@@ -902,7 +904,7 @@
         s.tzrxm,
         s.tzrzw,
         s.tzrdh,
-        s.xmjj,
+        s.xmjj,s.xmjzqk,
         s.name,
         s.strq,
         s.phone,
@@ -1096,6 +1098,7 @@
             <if test="tzrzw != null">tzrzw,</if>
             <if test="tzrdh != null">tzrdh,</if>
             <if test="xmjj != null">xmjj,</if>
+            <if test="xmjzqk != null">xmjzqk,</if>
             <if test="name != null and name != ''">name,</if>
             <if test="strq != null">strq,</if>
             <if test="phone != null and phone != ''">phone,</if>
@@ -1148,6 +1151,7 @@
             <if test="tzrzw != null">#{tzrzw},</if>
             <if test="tzrdh != null">#{tzrdh},</if>
             <if test="xmjj != null">#{xmjj},</if>
+            <if test="xmjzqk != null">#{xmjzqk},</if>
             <if test="name != null and name != ''">#{name},</if>
             <if test="strq != null">#{strq},</if>
             <if test="phone != null and phone != ''">#{phone},</if>
@@ -1204,6 +1208,7 @@
             <if test="tzrzw != null">tzrzw = #{tzrzw},</if>
             <if test="tzrdh != null">tzrdh = #{tzrdh},</if>
             <if test="xmjj != null">xmjj = #{xmjj},</if>
+            <if test="xmjzqk, != null">xmjj = #{xmjzqk},</if>
             <if test="name != null and name != ''">name = #{name},</if>
             <if test="strq != null">strq = #{strq},</if>
             <if test="phone != null and phone != ''">phone = #{phone},</if>