[fix] 工程管理

开发修改单新增 修改前说明、修改后说明字段
修改开发修改单的修改后端接口
修改开发修改单的新增后端接口

ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpDevelopModifyorder.java

@@ -96,6 +96,12 @@ public class ErpDevelopModifyorder extends BaseEntity
     /** 修改完成时间 */
     private Date updateFinishTime;
 
+    /** 修改前说明 */
+    private String beforeUpdateRemark;
+
+    /** 修改后说明 */
+    private String afterUpdateRemark;
+
     /** 流程实例ID */
     @Excel(name = "流程实例ID")
     private String instanceId;
@@ -310,6 +316,22 @@ public class ErpDevelopModifyorder extends BaseEntity
         this.updateFinishTime = updateFinishTime;
     }
 
+    public String getBeforeUpdateRemark() {
+        return beforeUpdateRemark;
+    }
+
+    public void setBeforeUpdateRemark(String beforeUpdateRemark) {
+        this.beforeUpdateRemark = beforeUpdateRemark;
+    }
+
+    public String getAfterUpdateRemark() {
+        return afterUpdateRemark;
+    }
+
+    public void setAfterUpdateRemark(String afterUpdateRemark) {
+        this.afterUpdateRemark = afterUpdateRemark;
+    }
+
     public String getInstanceId() {
         return instanceId;
     }
@@ -397,6 +419,8 @@ public class ErpDevelopModifyorder extends BaseEntity
             .append("userId", getUserId())
             .append("userName", getUserName())
             .append("updateFinishTime", getUpdateFinishTime())
+            .append("beforeUpdateRemark", getBeforeUpdateRemark())
+            .append("afterUpdateRemark", getAfterUpdateRemark())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())

ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml

@@ -25,6 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userId"    column="user_id"    />
         <result property="userName"    column="user_name"    />
         <result property="updateFinishTime"    column="update_finish_time"    />
+        <result property="beforeUpdateRemark"    column="before_update_remark"    />
+        <result property="afterUpdateRemark"    column="after_update_remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -42,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectErpDevelopModifyorderVo">
-        select develop_order_id, develop_oder_code, make_no, material_no, purchase_storage_status, quality_status, audit_status, complete_status, finsh_status, use_status, material_name, material_type, material_photo_url, material_unit, material_brand, material_describe, material_process_mode, user_id, update_finish_time, create_by, create_time, user_name, update_by, update_time, remark, instance_id, instance_type, submit_instance_id, apply_title, apply_time, apply_user, cancel_instance_id, restore_instance_id from erp_develop_modifyorder
+        select develop_order_id, develop_oder_code, make_no, material_no, purchase_storage_status, quality_status, audit_status, complete_status, finsh_status, use_status, material_name, material_type, material_photo_url, material_unit, material_brand, material_describe, material_process_mode, user_id, update_finish_time, before_update_remark, after_update_remark, create_by, create_time, user_name, update_by, update_time, remark, instance_id, instance_type, submit_instance_id, apply_title, apply_time, apply_user, cancel_instance_id, restore_instance_id from erp_develop_modifyorder
 
         </sql>
 
@@ -87,6 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialProcessMode != null">material_process_mode,</if>
             <if test="userId != null">user_id,</if>
             <if test="updateFinishTime != null">update_finish_time,</if>
+            <if test="beforeUpdateRemark != null">before_update_remark,</if>
+            <if test="afterUpdateRemark != null">after_update_remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="userName != null">user_name,</if>
@@ -121,6 +125,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialProcessMode != null">#{materialProcessMode},</if>
             <if test="userId != null">#{userId},</if>
             <if test="updateFinishTime != null">#{updateFinishTime},</if>
+            <if test="beforeUpdateRemark != null">#{beforeUpdateRemark},</if>
+            <if test="afterUpdateRemark != null">#{afterUpdateRemark},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="userName != null">#{userName},</if>
@@ -159,6 +165,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialProcessMode != null">material_process_mode = #{materialProcessMode},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="updateFinishTime != null">update_finish_time = #{updateFinishTime},</if>
+            <if test="beforeUpdateRemark != null">before_update_remark = #{beforeUpdateRemark},</if>
+            <if test="afterUpdateRemark != null">after_update_remark = #{afterUpdateRemark},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="userName != null">user_name = #{userName},</if>