修改审批,指派流程

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

@@ -95,10 +95,23 @@ public class ZsyzDbd extends BaseEntity
      */
     private String dbType;
 
-    /** 项目进度 1:项目首谈待审核 2:项目首谈已审核 3:线索分发要素部门 4:线索已指派 5:线索已承接 6:签约待审核 7:签约已审核 8:开工待审核 9:开工已审核 10:投产待审核 11:投产已审核 12:项目已入归 */
+    /** 项目进度 1:项目首谈 2:项目承接 3:项目签约 4:项目开工 5:项目投产  */
     //@Excel(name = "项目进度 1:项目首谈待审核 2:项目首谈已审核 3:线索分发要素部门 4:线索已指派 5:线索已承接 6:签约待审核 7:签约已审核 8:开工待审核 9:开工已审核 10:投产待审核 11:投产已审核 12:项目已入归")
     private String progress;
 
+    /**
+     * 项目状态 1:待审核 2:已通过 3:被退回
+     */
+    private String xmStatus;
+
+    public String getXmStatus() {
+        return xmStatus;
+    }
+
+    public void setXmStatus(String xmStatus) {
+        this.xmStatus = xmStatus;
+    }
+
     public String getProgress() {
         return progress;
     }

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

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="tbTime"    column="tb_time"    />
         <result property="dbType"    column="db_type"    />
         <result property="progress"    column="progress"    />
+        <result property="xmStatus"    column="xm_status"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -33,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectZsyzDbdVo">
-        select id, dh, xm_id, xmbh, xmmc, dept_id, dept_name, is_hf, db_time, blsx, dbsx, jzqk, czwt, jjjy, gzjh, tbr, phone, tb_time,db_type,progress, create_by, create_time, update_by, update_time, remark from zsyz_dbd
+        select id, dh, xm_id, xmbh, xmmc, dept_id, dept_name, is_hf, db_time, blsx, dbsx, jzqk, czwt, jjjy, gzjh, tbr, phone, tb_time,db_type,progress,xm_status, create_by, create_time, update_by, update_time, remark from zsyz_dbd
     </sql>
 
     <select id="selectZsyzDbdList" parameterType="ZsyzDbd" resultMap="ZsyzDbdResult">
@@ -58,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tbTime != null "> and tb_time = #{tbTime}</if>
             <if test="dbType != null "> and db_type = #{dbType}</if>
             <if test="progress != null "> and progress = #{progress}</if>
+            <if test="xmStatus != null "> and xm_status = #{xmStatus}</if>
         </where>
         order by db_time desc
     </select>
@@ -89,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tbTime != null "> and tb_time = #{tbTime}</if>
             <if test="dbType != null "> and db_type = #{dbType}</if>
             <if test="progress != null "> and progress = #{progress}</if>
+            <if test="xmStatus != null "> and xm_status = #{xmStatus}</if>
         </where>
     </select>
 
@@ -114,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tbTime != null">tb_time,</if>
             <if test="dbType != null">db_type,</if>
             <if test="progress != null">progress,</if>
+            <if test="xmStatus != null">xm_status,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -140,6 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tbTime != null">#{tbTime},</if>
             <if test="dbType != null">#{dbType},</if>
             <if test="progress != null">#{progress},</if>
+            <if test="xmStatus != null">#{xmStatus},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -171,6 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tbTime != null">tb_time = #{tbTime},</if>
             <if test="dbType != null">db_type = #{dbType},</if>
             <if test="progress != null">progress = #{progress},</if>
+            <if test="xmStatus != null">xm_status = #{xmStatus},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>