Procházet zdrojové kódy

增设一个项目对接模块;
2、每个模块增设“存在问题”;
3、拟落户地里没有“度假区”;
4、手机app中重大项目请设置成中心审核通过后再显示;
5、搜项目必须把项目名称一字不落的输入才能搜索,请增设关键词搜索功能,项目搜索只须输关键词即可;
6、新增项目请按录入顺序排列显示。

Administrator před 2 roky
rodič
revize
32089c22bb

+ 4 - 0
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/common/ZsyzCommonServiceImpL.java

@@ -93,6 +93,10 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                 //通过更改项目状态
                 zsyzSbbzb.setXmStatus(TWO);
                 zsyzSbbzb.setShjg(ONE);
+                String sfwlhxxxm = zsyzSbbzb.getSfwlhxxxm();
+                if ("S".equals(sfwlhxxxm)){
+                    zsyzSbbzb.setSfwlhxxxm("Y");
+                }
                 zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
             } else if (THR.equals(shjg)) {
                 //驳回

+ 12 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/ZsyzKgxx.java

@@ -83,6 +83,18 @@ public class ZsyzKgxx extends BaseEntity
     /** 附件集合 */
     private List<ZsyzFj> zsyzFjList;
 
+    /**
+     * 存在问题
+     */
+    private String czwt;
+
+    public String getCzwt() {
+        return czwt;
+    }
+
+    public void setCzwt(String czwt) {
+        this.czwt = czwt;
+    }
     public void setId(Long id) 
     {
         this.id = id;

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

@@ -166,6 +166,18 @@ public class ZsyzQyxx extends BaseEntity
 
     /** 附件集合 */
     private List<ZsyzFj> zsyzFjList;
+    /**
+     * 存在问题
+     */
+    private String czwt;
+
+    public String getCzwt() {
+        return czwt;
+    }
+
+    public void setCzwt(String czwt) {
+        this.czwt = czwt;
+    }
 
     public String getXytzely() {
         return xytzely;

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

@@ -290,6 +290,19 @@ public class ZsyzSbbzb extends BaseEntity
      */
     private String psnr;
 
+    /**
+     * 存在问题
+     */
+    private String czwt;
+
+    public String getCzwt() {
+        return czwt;
+    }
+
+    public void setCzwt(String czwt) {
+        this.czwt = czwt;
+    }
+
     public String getPsnr() {
         return psnr;
     }

+ 13 - 1
ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/ZsyzTcxx.java

@@ -151,8 +151,20 @@ public class ZsyzTcxx extends BaseEntity
 
     /** 附件集合 */
     private List<ZsyzFj> zsyzFjList;
+    /**
+     * 存在问题
+     */
+    private String czwt;
+
+    public String getCzwt() {
+        return czwt;
+    }
+
+    public void setCzwt(String czwt) {
+        this.czwt = czwt;
+    }
 
-    public void setId(Long id) 
+    public void setId(Long id)
     {
         this.id = id;
     }

+ 5 - 1
ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzKgxxMapper.xml

@@ -22,10 +22,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <result property="czwt"    column="czwt"    />
     </resultMap>
 
     <sql id="selectZsyzKgxxVo">
-        select id, xm_id, xmbh,xmxsmc, xmmc, kgrq, njgrq, sscrq, ntcsj, rtsj, nrtsj, kggjrsjh, create_by, create_time, update_by, update_time, remark from zsyz_kgxx
+        select id, xm_id, xmbh,xmxsmc,czwt, xmmc, kgrq, njgrq, sscrq, ntcsj, rtsj, nrtsj, kggjrsjh, create_by, create_time, update_by, update_time, remark from zsyz_kgxx
     </sql>
 
     <select id="selectZsyzKgxxList" parameterType="ZsyzKgxx" resultMap="ZsyzKgxxResult">
@@ -70,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="czwt != null">czwt,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="xmId != null">#{xmId},</if>
@@ -88,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="czwt != null">#{czwt},</if>
          </trim>
     </insert>
 
@@ -110,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="czwt != null">czwt = #{czwt},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -43,10 +43,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <result property="czwt"    column="czwt"    />
     </resultMap>
 
     <sql id="selectZsyzQyxxVo">
-        select id, xm_id, xmbh, xmxsmc,xmmc, dfqyr, wfqyr, tbrq, qyrq,xytzely, 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
+        select id, xm_id, xmbh, xmxsmc,xmmc,czwt, dfqyr, wfqyr, tbrq, qyrq,xytzely, 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">
@@ -133,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="czwt != null">czwt,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="xmId != null">#{xmId},</if>
@@ -172,6 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="czwt != null">#{czwt},</if>
          </trim>
     </insert>
 
@@ -215,6 +218,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="czwt != null">czwt = #{czwt},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -56,7 +56,7 @@
         <result property="shjg" column="shjg"/>
         <result property="shsj" column="shsj"/>
         <result property="psnr" column="psnr"/>
-
+        <result property="czwt" column="czwt"/>
 
 
 
@@ -107,6 +107,7 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="czwt" column="czwt"/>
     </resultMap>
 
     <!--开工信息-->
@@ -127,6 +128,7 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="czwt" column="czwt"/>
     </resultMap>
 
     <!--投产信息-->
@@ -165,6 +167,7 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="czwt" column="czwt"/>
     </resultMap>
 
     <resultMap type="ZsyzShyj" id="ZsyzShyjResult">
@@ -259,7 +262,7 @@
                cjd_name,
                is_meet,
                meet_remark,
-               shjg,psnr
+               shjg,psnr,czwt
         from zsyz_sbbzb
     </sql>
 
@@ -270,7 +273,7 @@
         s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, 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.cjd_name, s.is_meet, s.meet_remark,s.shjg,s.psnr,s.czwt,
         q.id, q.xm_id, q.xmbh, q.xmmc, q.dfqyr, q.wfqyr, q.tbrq, q.qyrq,q.xytzely, q.xytze, q.swzj, q.gdzctze,
         q.xmgjrxm,q.xmgjrzw,q.xmgjrsjh,
         q.xmszd, q.sshy, q.tzfs, q.jsfs, q.sfys, q.jsnr,
@@ -294,8 +297,8 @@
             <if test="sbdw != null  and sbdw != ''">and s.sbdw = #{sbdw}</if>
             <if test="tbrq != null ">and s.tbrq = #{tbrq}</if>
             <if test="zszxfzr != null  and zszxfzr != ''">and s.zszxfzr = #{zszxfzr}</if>
-            <if test="xmbh != null  and xmbh != ''">and s.xmbh = #{xmbh}</if>
-            <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
+            <if test="xmbh != null  and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
+            <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc like concat('%', #{xmxsmc}, '%')</if>
             <if test="sfwlhxxxm != null  and sfwlhxxxm != ''">and s.sfwlhxxxm = #{sfwlhxxxm}</if>
             <if test="yzdqId != null  and yzdqId != ''">and s.yzdq_id = #{yzdqId}</if>
             <if test="yzdqName != null  and yzdqName != ''">and s.yzdq_name like concat('%', #{yzdqName}, '%')</if>
@@ -353,7 +356,7 @@
         s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, 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.cjd_name, s.is_meet, s.meet_remark,s.shjg,s.psnr,s.czwt,
         q.id, q.xm_id, q.xmbh, q.xmmc, q.dfqyr, q.wfqyr, q.tbrq, q.qyrq,q.xytzely, q.xytze, q.swzj, q.gdzctze,
         q.xmgjrxm,q.xmgjrzw,q.xmgjrsjh,
         q.xmszd, q.sshy, q.tzfs, q.jsfs, q.sfys, q.jsnr,
@@ -377,8 +380,8 @@
             <if test="sbdw != null  and sbdw != ''">and s.sbdw = #{sbdw}</if>
             <if test="tbrq != null ">and s.tbrq = #{tbrq}</if>
             <if test="zszxfzr != null  and zszxfzr != ''">and s.zszxfzr = #{zszxfzr}</if>
-            <if test="xmbh != null  and xmbh != ''">and s.xmbh = #{xmbh}</if>
-            <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
+            <if test="xmbh != null  and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
+            <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc like concat('%', #{xmxsmc}, '%')</if>
             <if test="sfwlhxxxm != null  and sfwlhxxxm != ''">and s.sfwlhxxxm = #{sfwlhxxxm}</if>
             <if test="yzdqId != null  and yzdqId != ''">and s.yzdq_id = #{yzdqId}</if>
             <if test="yzdqName != null  and yzdqName != ''">and s.yzdq_name like concat('%', #{yzdqName}, '%')</if>
@@ -436,7 +439,7 @@
         s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, 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.cjd_name, s.is_meet, s.meet_remark,s.shjg,s.psnr,s.czwt
         from zsyz_sbbzb s
         where s.id = #{id} and s.is_del = 'N'
     </select>
@@ -448,7 +451,7 @@
         s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, 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.cjd_name, s.is_meet, s.meet_remark,s.psnr,s.czwt,
         q.id, q.xm_id, q.xmbh, q.xmmc, q.dfqyr, q.wfqyr, q.tbrq, q.qyrq,q.xytzely, q.xytze, q.swzj, q.gdzctze,
         q.xmgjrxm,q.xmgjrzw,q.xmgjrsjh,
         q.xmszd, q.sshy, q.tzfs, q.jsfs, q.sfys, q.jsnr,
@@ -475,8 +478,8 @@
             <if test="sbdw != null  and sbdw != ''">and s.sbdw = #{sbdw}</if>
             <if test="tbrq != null ">and s.tbrq = #{tbrq}</if>
             <if test="zszxfzr != null  and zszxfzr != ''">and s.zszxfzr = #{zszxfzr}</if>
-            <if test="xmbh != null  and xmbh != ''">and s.xmbh = #{xmbh}</if>
-            <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
+            <if test="xmbh != null  and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
+            <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc like concat('%', #{xmxsmc}, '%')</if>
             <if test="sfwlhxxxm != null  and sfwlhxxxm != ''">and s.sfwlhxxxm = #{sfwlhxxxm}</if>
             <if test="yzdqId != null  and yzdqId != ''">and s.yzdq_id = #{yzdqId}</if>
             <if test="yzdqName != null  and yzdqName != ''">and s.yzdq_name like concat('%', #{yzdqName}, '%')</if>
@@ -574,12 +577,13 @@
         s.cjd_id,
         s.cjd_name,
         s.is_meet,
-        s.meet_remark,s.psnr
+        s.meet_remark,s.psnr,s.czwt
         from zsyz_project_dept d
         left join zsyz_sbbzb s on s.id = d.xm_id
         where s.is_del = 'N'
         and d.dept_id = #{deptId} and d.is_del = 'N' and d.dept_type = '2'
-        <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
+        <if test="xmbh != null  and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
+        <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc like concat('%', #{xmxsmc}, '%')</if>
         <if test="progress != null  and progress != ''">and find_in_set(s.progress , #{progress})</if>
         <if test="xmStatus != null  and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
         <if test="cjdId != null ">and cjd_id = #{cjdId}</if>
@@ -639,11 +643,12 @@
         s.cjd_id,
         s.cjd_name,
         s.is_meet,
-        s.meet_remark,s.psnr
+        s.meet_remark,s.psnr,s.czwt
         from zsyz_sbbzb s
         where s.is_del = 'N'
         <if test="deptId != null  and deptId != ''">and s.dept_id = #{deptId}</if>
-        <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
+        <if test="xmbh != null  and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
+        <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc like concat('%', #{xmxsmc}, '%')</if>
         <if test="progress != null  and progress != ''">and find_in_set(s.progress , #{progress})</if>
         <if test="xmStatus != null  and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
         <if test="cjdId != null ">and cjd_id = #{cjdId}</if>
@@ -707,12 +712,13 @@
         s.cjd_id,
         s.cjd_name,
         s.is_meet,
-        s.meet_remark,s.psnr
+        s.meet_remark,s.psnr,s.czwt
         from zsyz_project_dept d
         left join zsyz_sbbzb s on s.id = d.xm_id
         where s.is_del = 'N'
         and d.dept_id = #{deptId} and d.is_del = 'N' and d.dept_type = '2'
-        <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
+        <if test="xmbh != null  and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
+        <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc like concat('%', #{xmxsmc}, '%')</if>
         <if test="progress != null  and progress != ''">and find_in_set(s.progress , #{progress})</if>
         <if test="xmStatus != null  and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
         <if test="cjdId != null ">and cjd_id = #{cjdId}</if>
@@ -772,11 +778,12 @@
         s.cjd_id,
         s.cjd_name,
         s.is_meet,
-        s.meet_remark,s.psnr
+        s.meet_remark,s.psnr,s.czwt
         from zsyz_sbbzb s
         where s.is_del = 'N'
         <if test="deptId != null  and deptId != ''">and s.dept_id = #{deptId}</if>
-        <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
+        <if test="xmbh != null  and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
+        <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc like concat('%', #{xmxsmc}, '%')</if>
         <if test="progress != null  and progress != ''">and find_in_set(s.progress , #{progress})</if>
         <if test="xmStatus != null  and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
         <if test="cjdId != null ">and cjd_id = #{cjdId}</if>
@@ -803,8 +810,8 @@
             <if test="sbdw != null  and sbdw != ''">and s.sbdw = #{sbdw}</if>
             <if test="tbrq != null ">and s.tbrq = #{tbrq}</if>
             <if test="zszxfzr != null  and zszxfzr != ''">and s.zszxfzr = #{zszxfzr}</if>
-            <if test="xmbh != null  and xmbh != ''">and s.xmbh = #{xmbh}</if>
-            <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
+            <if test="xmbh != null  and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
+            <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc like concat('%', #{xmxsmc}, '%')</if>
             <if test="sfwlhxxxm != null  and sfwlhxxxm != ''">and s.sfwlhxxxm = #{sfwlhxxxm}</if>
             <if test="yzdqId != null  and yzdqId != ''">and s.yzdq_id = #{yzdqId}</if>
             <if test="yzdqName != null  and yzdqName != ''">and s.yzdq_name like concat('%', #{yzdqName}, '%')</if>
@@ -853,7 +860,8 @@
         <include refid="selectZsyzSbbzbVo"/>
         <where>
             is_del = 'N'
-            <if test="xmxsmc != null  and xmxsmc != ''">and xmxsmc = #{xmxsmc}</if>
+            <if test="xmbh != null  and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
+            <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc like concat('%', #{xmxsmc}, '%')</if>
             <if test="cjdId != null ">and (cjd_id = #{cjdId} or dept_id = #{cjdId})</if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                 AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
@@ -913,12 +921,13 @@
         s.cjd_id,
         s.cjd_name,
         s.is_meet,
-        s.meet_remark,s.psnr
+        s.meet_remark,s.psnr,s.czwt
         from zsyz_project_dept d
         left join zsyz_sbbzb s on s.id = d.xm_id
         where s.is_del = 'N'
         and d.dept_id = #{deptId} and d.is_del = 'N' and d.dept_type = '3'
-        <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
+        <if test="xmbh != null  and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
+        <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc like concat('%', #{xmxsmc}, '%')</if>
         <if test="progress != null  and progress != ''">and find_in_set(s.progress , #{progress})</if>
         <if test="xmStatus != null  and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
         <if test="cjdId != null ">and cjd_id = #{cjdId}</if>
@@ -1053,6 +1062,7 @@
             <if test="meetRemark != null">meet_remark,</if>
             <if test="shjg != null">shjg,</if>
             <if test="psnr != null">psnr,</if>
+            <if test="czwt != null">czwt,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sbdw != null and sbdw != ''">#{sbdw},</if>
@@ -1104,6 +1114,7 @@
             <if test="meetRemark != null">#{meetRemark},</if>
             <if test="shjg != null">#{shjg},</if>
             <if test="psnr != null">#{psnr},</if>
+            <if test="czwt != null">#{czwt},</if>
         </trim>
     </insert>
 
@@ -1159,6 +1170,7 @@
             <if test="meetRemark != null">meet_remark = #{meetRemark},</if>
             <if test="shjg != null">shjg = #{shjg},</if>
             <if test="psnr != null">psnr = #{psnr},</if>
+            <if test="czwt != null">czwt = #{czwt},</if>
         </trim>
         where id = #{id}
     </update>

+ 5 - 1
ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzTcxxMapper.xml

@@ -40,10 +40,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <result property="czwt"    column="czwt"    />
     </resultMap>
 
     <sql id="selectZsyzTcxxVo">
-        select id, xm_id, xmbh, xmxsmc,xmmc, tcrq, rgsj, nrgsj, tcgjrsjh, sjdze, ydmj, tdcr, xjcf, cftr, sbqd, sbfp, sbht, fkpz, zlcf, zlcftr, zlsbqd, zlsbfp, zlsbht, zlfkpz, sjss, lxy, jnsb, zbtr, ndsjss, qt, create_by, create_time, update_by, update_time, remark from zsyz_tcxx
+        select id, xm_id, xmbh, xmxsmc,xmmc, czwt,tcrq, rgsj, nrgsj, tcgjrsjh, sjdze, ydmj, tdcr, xjcf, cftr, sbqd, sbfp, sbht, fkpz, zlcf, zlcftr, zlsbqd, zlsbfp, zlsbht, zlfkpz, sjss, lxy, jnsb, zbtr, ndsjss, qt, create_by, create_time, update_by, update_time, remark from zsyz_tcxx
     </sql>
 
     <select id="selectZsyzTcxxList" parameterType="ZsyzTcxx" resultMap="ZsyzTcxxResult">
@@ -124,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="czwt != null">czwt,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="xmId != null">#{xmId},</if>
@@ -160,6 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="czwt != null">#{czwt},</if>
          </trim>
     </insert>
 
@@ -200,6 +203,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="czwt != null">czwt = #{czwt},</if>
         </trim>
         where id = #{id}
     </update>