[fix] 工程管理

开发修改单新增 生产单号、修改完成时间、流程实例等字段
修改开发修改单的查询后端接口，新增查询刚添加的字段
修改开发修改单的修改后端接口
修改开发修改单的新增后端接口
新增 开发修改单Vo类：加上审核流相关等字段

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

@@ -1,10 +1,13 @@
 package com.ruoyi.erp.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 开发修改单对象 erp_develop_modifyorder
  * 
@@ -22,31 +25,35 @@ public class ErpDevelopModifyorder extends BaseEntity
     @Excel(name = "开发修改单号")
     private String developOderCode;
 
+    /** 生产单号 */
+    @Excel(name = "生产单号")
+    private String makeNo;
+
     /** 料号 */
     @Excel(name = "料号")
     private String materialNo;
 
-    /** 采购入库状态 */
+    /** 采购入库状态（0待采购、1采购中、2待暂收、3部分暂收、4全部暂收、5已暂收、6待入库、7部分入库、8全部入库、9已入库） */
     @Excel(name = "采购入库状态")
     private String purchaseStorageStatus;
 
-    /** 品质状态 */
+    /** 品质状态 （0待品质、1部分品质、2全部品质）*/
     @Excel(name = "品质状态")
     private String qualityStatus;
 
-    /** 审核状态 */
+    /** 审核状态 （0待审核、1审核通过、2审核拒绝）*/
     @Excel(name = "审核状态")
     private String auditStatus;
 
-    /** 确认状态 */
+    /** 确认状态 （0待确认、1部分确认、2已确认）*/
     @Excel(name = "确认状态")
     private String completeStatus;
 
-    /** 完成状态 */
+    /** 完成状态 （0待完成、1已完成）*/
     @Excel(name = "完成状态")
     private String finshStatus;
 
-    /** 使用状态 */
+    /** 使用状态 （0否、1是、2已作废）*/
     @Excel(name = "使用状态")
     private String useStatus;
 
@@ -86,8 +93,42 @@ public class ErpDevelopModifyorder extends BaseEntity
     @Excel(name = "工程员姓名")
     private String userName;
 
-    @Excel(name = "加工单号")
-    private String makeNo;
+    /** 修改完成时间 */
+    private Date updateFinishTime;
+
+    /** 流程实例ID */
+    @Excel(name = "流程实例ID")
+    private String instanceId;
+
+    /** 流程实例类型 */
+    @Excel(name = "流程实例类型")
+    private String instanceType;
+
+    /** 流程提交实例ID */
+    @Excel(name = "流程提交实例ID")
+    private String submitInstanceId;
+
+    /** 申请标题 */
+    @Excel(name = "申请标题")
+    private String applyTitle;
+
+    /** 申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date applyTime;
+
+    /** 申请人 */
+    @Excel(name = "申请人")
+    private String applyUser;
+
+    /** 流程作废实例ID */
+    @Excel(name = "流程作废实例ID")
+    private String cancelInstanceId;
+
+    /** 流程恢复实例ID */
+    @Excel(name = "流程恢复实例ID")
+    private String restoreInstanceId;
+
 
     public String getMakeNo() {
         return makeNo;
@@ -260,11 +301,85 @@ public class ErpDevelopModifyorder extends BaseEntity
         return userName;
     }
 
+
+    public Date getUpdateFinishTime() {
+        return updateFinishTime;
+    }
+
+    public void setUpdateFinishTime(Date updateFinishTime) {
+        this.updateFinishTime = updateFinishTime;
+    }
+
+    public String getInstanceId() {
+        return instanceId;
+    }
+
+    public void setInstanceId(String instanceId) {
+        this.instanceId = instanceId;
+    }
+
+    public String getInstanceType() {
+        return instanceType;
+    }
+
+    public void setInstanceType(String instanceType) {
+        this.instanceType = instanceType;
+    }
+
+    public String getSubmitInstanceId() {
+        return submitInstanceId;
+    }
+
+    public void setSubmitInstanceId(String submitInstanceId) {
+        this.submitInstanceId = submitInstanceId;
+    }
+
+    public String getApplyTitle() {
+        return applyTitle;
+    }
+
+    public void setApplyTitle(String applyTitle) {
+        this.applyTitle = applyTitle;
+    }
+
+    public Date getApplyTime() {
+        return applyTime;
+    }
+
+    public void setApplyTime(Date applyTime) {
+        this.applyTime = applyTime;
+    }
+
+    public String getApplyUser() {
+        return applyUser;
+    }
+
+    public void setApplyUser(String applyUser) {
+        this.applyUser = applyUser;
+    }
+
+    public String getCancelInstanceId() {
+        return cancelInstanceId;
+    }
+
+    public void setCancelInstanceId(String cancelInstanceId) {
+        this.cancelInstanceId = cancelInstanceId;
+    }
+
+    public String getRestoreInstanceId() {
+        return restoreInstanceId;
+    }
+
+    public void setRestoreInstanceId(String restoreInstanceId) {
+        this.restoreInstanceId = restoreInstanceId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("developOrderId", getDevelopOrderId())
             .append("developOderCode", getDevelopOderCode())
+            .append("makeNo",getMakeNo())
             .append("materialNo", getMaterialNo())
             .append("purchaseStorageStatus", getPurchaseStorageStatus())
             .append("qualityStatus", getQualityStatus())
@@ -280,12 +395,21 @@ public class ErpDevelopModifyorder extends BaseEntity
             .append("materialDescribe", getMaterialDescribe())
             .append("materialProcessMode", getMaterialProcessMode())
             .append("userId", getUserId())
+            .append("userName", getUserName())
+            .append("updateFinishTime", getUpdateFinishTime())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
-            .append("userName", getUserName())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
+            .append("instanceId", getInstanceId())
+            .append("instanceType", getInstanceType())
+            .append("submitInstanceId", getSubmitInstanceId())
+            .append("applyTitle", getApplyTitle())
+            .append("applyTime", getApplyTime())
+            .append("applyUser", getApplyUser())
+            .append("cancelInstanceId", getCancelInstanceId())
+            .append("restoreInstanceId", getRestoreInstanceId())
             .toString();
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/erp/domain/vo/ErpDevelopModifyorderVo.java

@@ -0,0 +1,35 @@
+package com.ruoyi.erp.domain.vo;
+
+import com.ruoyi.erp.domain.ErpDevelopModifyorder;
+import lombok.Data;
+
+import java.util.Date;
+
+/*开发修改单Vo类*/
+@Data
+public class ErpDevelopModifyorderVo extends ErpDevelopModifyorder {
+
+    private static final long serialVersionUID = -3627380777050403384L;
+
+    /** 申请人姓名 */
+    private String applyUserName;
+    /** 任务ID */
+    private String taskId;
+    /** 任务名称 */
+    private String taskName;
+    /** 办理时间 */
+    private Date doneTime;
+    /** 创建人 */
+    private String createUserName;
+    /** 流程实例状态 1 激活 2 挂起 */
+    private String suspendState;
+    /** 待办用户id */
+    private String todoUserId;
+    /** 流程实例类型名称 */
+    private String instanceTypeName;
+
+    /**
+     * 关键词
+     */
+    private String keyword;
+}

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

@@ -4,9 +4,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.erp.mapper.ErpDevelopModifyorderMapper">
     
-    <resultMap type="ErpDevelopModifyorder" id="ErpDevelopModifyorderResult">
+    <resultMap type="ErpDevelopModifyorderVo" id="ErpDevelopModifyorderResult">
         <result property="developOrderId"    column="develop_order_id"    />
         <result property="developOderCode"    column="develop_oder_code"    />
+        <result property="makeNo" column="make_no"/>
         <result property="materialNo"    column="material_no"    />
         <result property="purchaseStorageStatus"    column="purchase_storage_status"    />
         <result property="qualityStatus"    column="quality_status"    />
@@ -22,16 +23,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialDescribe"    column="material_describe"    />
         <result property="materialProcessMode"    column="material_process_mode"    />
         <result property="userId"    column="user_id"    />
+        <result property="userName"    column="user_name"    />
+        <result property="updateFinishTime"    column="update_finish_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
-        <result property="userName"    column="user_name"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <result property="instanceId"    column="instance_id"    />
+        <result property="instanceType"    column="instance_type"    />
+        <result property="submitInstanceId"    column="submit_instance_id"    />
+        <result property="applyTitle"    column="apply_title"    />
+        <result property="applyTime"    column="apply_time"    />
+        <result property="applyUser"    column="apply_user"    />
+        <result property="cancelInstanceId"    column="cancel_instance_id"    />
+        <result property="restoreInstanceId"    column="restore_instance_id"    />
+        <result property="instanceTypeName"    column="instance_type_name"    />
     </resultMap>
 
     <sql id="selectErpDevelopModifyorderVo">
-        select develop_order_id, develop_oder_code, 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, create_by, create_time, user_name, update_by, update_time, remark 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, 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>
 
@@ -55,10 +66,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where develop_order_id = #{developOrderId}
     </select>
         
-    <insert id="insertErpDevelopModifyorder" parameterType="ErpDevelopModifyorder" useGeneratedKeys="true" keyProperty="developOrderId">
+    <insert id="insertErpDevelopModifyorder" parameterType="ErpDevelopModifyorderVo" useGeneratedKeys="true" keyProperty="developOrderId">
         insert into erp_develop_modifyorder
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="developOderCode != null">develop_oder_code,</if>
+            <if test="makeNo != null">make_no,</if>
             <if test="materialNo != null">material_no,</if>
             <if test="purchaseStorageStatus != null">purchase_storage_status,</if>
             <if test="qualityStatus != null">quality_status,</if>
@@ -74,15 +86,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialDescribe != null">material_describe,</if>
             <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="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="userName != null">user_name,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="instanceId != null">instance_id,</if>
+            <if test="instanceType != null">instance_type,</if>
+            <if test="submitInstanceId != null">submit_instance_id,</if>
+            <if test="applyTitle != null">apply_title,</if>
+            <if test="applyTime != null">apply_time,</if>
+            <if test="applyUser != null">apply_user,</if>
+            <if test="cancelInstanceId != null">cancel_instance_id,</if>
+            <if test="restoreInstanceId != null">restore_instance_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="developOderCode != null">#{developOderCode},</if>
+            <if test="makeNo != null">#{makeNo},</if>
             <if test="materialNo != null">#{materialNo},</if>
             <if test="purchaseStorageStatus != null">#{purchaseStorageStatus},</if>
             <if test="qualityStatus != null">#{qualityStatus},</if>
@@ -98,19 +120,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialDescribe != null">#{materialDescribe},</if>
             <if test="materialProcessMode != null">#{materialProcessMode},</if>
             <if test="userId != null">#{userId},</if>
+            <if test="updateFinishTime != null">#{updateFinishTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="userName != null">#{userName},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="instanceId != null">#{instanceId},</if>
+            <if test="instanceType != null">#{instanceType},</if>
+            <if test="submitInstanceId != null">#{submitInstanceId},</if>
+            <if test="applyTitle != null">#{applyTitle},</if>
+            <if test="applyTime != null">#{applyTime},</if>
+            <if test="applyUser != null">#{applyUser},</if>
+            <if test="cancelInstanceId != null">#{cancelInstanceId},</if>
+            <if test="restoreInstanceId != null">#{restoreInstanceId},</if>
          </trim>
     </insert>
 
-    <update id="updateErpDevelopModifyorder" parameterType="ErpDevelopModifyorder">
+    <update id="updateErpDevelopModifyorder" parameterType="ErpDevelopModifyorderVo">
         update erp_develop_modifyorder
         <trim prefix="SET" suffixOverrides=",">
             <if test="developOderCode != null">develop_oder_code = #{developOderCode},</if>
+            <if test="makeNo != null">make_no = #{makeNo},</if>
             <if test="materialNo != null">material_no = #{materialNo},</if>
             <if test="purchaseStorageStatus != null">purchase_storage_status = #{purchaseStorageStatus},</if>
             <if test="qualityStatus != null">quality_status = #{qualityStatus},</if>
@@ -126,12 +158,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialDescribe != null">material_describe = #{materialDescribe},</if>
             <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="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="userName != null">user_name = #{userName},</if>
             <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="instanceId != null">instance_id = #{instanceId},</if>
+            <if test="instanceType != null">instance_type = #{instanceType},</if>
+            <if test="submitInstanceId != null">submit_instance_id = #{submitInstanceId},</if>
+            <if test="applyTitle != null">apply_title = #{applyTitle},</if>
+            <if test="applyTime != null">apply_time = #{applyTime},</if>
+            <if test="applyUser != null">apply_user = #{applyUser},</if>
+            <if test="cancelInstanceId != null">cancel_instance_id = #{cancelInstanceId},</if>
+            <if test="restoreInstanceId != null">restore_instance_id = #{restoreInstanceId},</if>
         </trim>
         where develop_order_id = #{developOrderId}
     </update>