Browse Source

新增发改委审核相关接口

Administrator 2 năm trước cách đây
mục cha
commit
f5b4ee7370

+ 22 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/fgw/FgwJzqk.java

@@ -60,10 +60,16 @@ public class FgwJzqk extends BaseEntity
     /** 是否建设 N否 Y是 */
     @Excel(name = "是否建设 N否 Y是")
     private String isJs;
+    /** 是否完成节点 N否 Y是 */
+    @Excel(name = "是否完成节点 N否 Y是")
+    private String isJd;
 
     /** 是否纳统 N否 Y是 */
     @Excel(name = "是否纳统 N否 Y是")
     private String isNt;
+    /** 是否竣工 N否 Y是 */
+    @Excel(name = "是否竣工 N否 Y是")
+    private String isJg;
 
     /** 纳统投资 */
     @Excel(name = "纳统投资")
@@ -73,6 +79,22 @@ public class FgwJzqk extends BaseEntity
      */
     private String isSh;
 
+    public String getIsJd() {
+        return isJd;
+    }
+
+    public void setIsJd(String isJd) {
+        this.isJd = isJd;
+    }
+
+    public String getIsJg() {
+        return isJg;
+    }
+
+    public void setIsJg(String isJg) {
+        this.isJg = isJg;
+    }
+
     public String getIsSh() {
         return isSh;
     }

+ 13 - 1
ruoyi-system/src/main/resources/mapper/system/fgw/FgwJzqkMapper.xml

@@ -13,6 +13,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName"    column="dept_name"    />
         <result property="isNt"    column="is_nt"    />
         <result property="isJs"    column="is_js"    />
+        <result property="isJd"    column="is_jd"    />
+        <result property="isJg"    column="is_jg"    />
         <result property="nttz"    column="nttz"    />
         <result property="jzqk"    column="jzqk"    />
         <result property="sgll"    column="sgll"    />
@@ -26,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFgwJzqkVo">
-        select id, xm_id, xmbh,is_nt,is_js,nttz,is_sh, xmmc, dept_id, dept_name, jzqk, sgll, hb_time, create_by, create_time, update_by, update_time, remark from fgw_jzqk
+        select id, xm_id, xmbh,is_nt,is_js,is_jd,is_jg,nttz,is_sh, xmmc, dept_id, dept_name, jzqk, sgll, hb_time, create_by, create_time, update_by, update_time, remark from fgw_jzqk
     </sql>
 
     <select id="selectFgwJzqkList" parameterType="FgwJzqk" resultMap="FgwJzqkResult">
@@ -38,6 +40,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isNt != null  and isNt != ''"> and is_nt = #{isNt}</if>
             <if test="isjs != null  and isjs != ''"> and is_js = #{isjs}</if>
             <if test="isSh != null  and isSh != ''"> and is_sh = #{isSh}</if>
+            <if test="isJd != null  and isJd != ''"> and is_jd = #{isJd}</if>
+            <if test="isJg != null  and isJg != ''"> and is_jg = #{isJg}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="jzqk != null  and jzqk != ''"> and jzqk = #{jzqk}</if>
@@ -62,6 +66,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isNt != null  and isNt != ''"> and is_nt = #{isNt}</if>
             <if test="isjs != null  and isjs != ''"> and is_js = #{isjs}</if>
             <if test="isSh != null  and isSh != ''"> and is_sh = #{isSh}</if>
+            <if test="isJd != null  and isJd != ''"> and is_jd = #{isJd}</if>
+            <if test="isJg != null  and isJg != ''"> and is_jg = #{isJg}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="jzqk != null  and jzqk != ''"> and jzqk = #{jzqk}</if>
@@ -86,6 +92,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptName != null and deptName != ''">dept_name,</if>
             <if test="isNt != null and isNt != ''">is_nt,</if>
             <if test="isJs != null and isJs != ''">is_js,</if>
+            <if test="isJd != null and isJd != ''">is_jd,</if>
+            <if test="isJg != null and isJg != ''">is_jg,</if>
             <if test="nttz != null and nttz != ''">nttz,</if>
             <if test="isSh != null and isSh != ''">is_sh,</if>
             <if test="jzqk != null">jzqk,</if>
@@ -105,6 +113,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptName != null and deptName != ''">#{deptName},</if>
             <if test="isNt != null and isNt != ''">#{isNt},</if>
             <if test="isJs != null and isJs != ''">#{isJs},</if>
+            <if test="isJd != null and isJd != ''">#{isJd},</if>
+            <if test="isJg != null and isJg != ''">#{isJg},</if>
             <if test="nttz != null and nttz != ''">#{nttz},</if>
             <if test="isSh != null and isSh != ''">#{isSh},</if>
             <if test="jzqk != null">#{jzqk},</if>
@@ -128,6 +138,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
             <if test="isNt != null and isNt != ''">is_nt = #{isNt},</if>
             <if test="isJs != null and isJs != ''">is_js = #{isJs},</if>
+            <if test="isJd != null and isJd != ''">is_jd = #{isJd},</if>
+            <if test="isJg != null and isJg != ''">is_jg = #{isJg},</if>
             <if test="nttz != null and nttz != ''">nttz = #{nttz},</if>
             <if test="isSh != null and isSh != ''">is_sh = #{isSh},</if>
             <if test="jzqk != null">jzqk = #{jzqk},</if>