增加修改技术方案字段

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcTechnicalPlan.java

@@ -111,6 +111,10 @@ public class CmcTechnicalPlan extends BaseEntity
 //    @Excel(name = "修改技术方案")
     private String modifyDocument;
 
+    /** 修改技术方案 */
+//    @Excel(name = "修改技术方案")
+    private String reviseDocument;
+
     /** 最终技术方案 */
 //    @Excel(name = "最终技术方案")
     private String finalDocument;
@@ -322,6 +326,15 @@ public class CmcTechnicalPlan extends BaseEntity
     {
         return modifyDocument;
     }
+    public void setReviseDocument(String reviseDocument)
+    {
+        this.reviseDocument = reviseDocument;
+    }
+
+    public String getReviseDocument()
+    {
+        return reviseDocument;
+    }
     public void setFinalDocument(String finalDocument)
     {
         this.finalDocument = finalDocument;

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcTechnicalMapper.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="confirmTime"    column="confirm_time"    />
         <association property="acceptUser"    javaType="SysUser"         resultMap="AcceptUserResult" />
         <association property="disclosureUser"    javaType="SysUser"         resultMap="DisclosureUserResult" />
-        <association property="confirmUser"    javaType="SysUser"         resultMap="confirmUserResult" />
+        <association property="confirmUser"    javaType="SysUser"         resultMap="ConfirmUserResult" />
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
     </resultMap>
 

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcTechnicalPlanMapper.xml

@@ -17,6 +17,7 @@
         <result property="technicalTime"    column="technical_time"    />
         <result property="technicalDocument"    column="technical_document"    />
         <result property="modifyDocument"    column="modify_document"    />
+        <result property="reviseDocument"    column="revise_document"    />
         <result property="finalDocument"    column="final_document"    />
         <result property="designDescription"    column="design_description"    />
         <result property="technicalComment"    column="technical_comment"    />
@@ -73,7 +74,7 @@
 
     <sql id="selectCmcTechnicalPlanVo">
         select t.technical_plan_id, t.project_id, p.project_number, p.project_name, t.technical_director, u.nick_name as direct_nick_name, t.technical_designer, u1.nick_name as design_nick_name,
-               t.technical_planner, u2.nick_name as plan_nick_name, t.plan_comment, t.quality_inspector, t.technical_time, t.technical_document, t.modify_document, t.final_document,
+               t.technical_planner, u2.nick_name as plan_nick_name, t.plan_comment, t.quality_inspector, t.technical_time, t.technical_document, t.modify_document, t.revise_document, t.final_document,
                t.design_description, t.technical_comment, t.technical_auditor, u3.nick_name as audit_nick_name, t.tech_dept_leader, u4.nick_name as tech_nick_name, t.tech_dept_comment, t.manager_user_id,
                u5.nick_name as manager_nick_name, t.manage_comment, t.technical_upload_time, t.tech_approval_time, t.tech_dept_time, t.manage_approval_time from cmc_technical_plan as t
         left join sys_user as u on u.user_id = t.technical_director
@@ -172,6 +173,7 @@
             <if test="qualityInspector != null">quality_inspector = #{qualityInspector},</if>
             <if test="technicalTime != null">technical_time = #{technicalTime},</if>
             <if test="technicalDocument != null">technical_document = #{technicalDocument},</if>
+            <if test="reviseDocument != null">revise_document = #{reviseDocument},</if>
             <if test="modifyDocument != null">modify_document = #{modifyDocument},</if>
             <if test="finalDocument != null">final_document = #{finalDocument},</if>
             <if test="designDescription != null">design_description = #{designDescription},</if>