优化采购仓库功能

java110-bean/src/main/java/com/java110/dto/oaWorkflow/OaWorkflowDto.java

@@ -19,6 +19,7 @@ public class OaWorkflowDto extends PageDto implements Serializable {
     public static final String STATE_COMPLAINT = "C";//部署完成
 
     public static final String FLOW_TYPE_ITEM_RELEASE="2002";//物品放行
+    public static final String FLOW_TYPE_RESOURCE="5005";//采购
     public static final String FLOW_TYPE_VISIT="3003";// 访客审核
     public static final String FLOW_TYPE_PUBLIC="1001";//物品放行
 

java110-bean/src/main/java/com/java110/dto/resource/ResourceAuditFlowDto.java

@@ -21,7 +21,7 @@ public class ResourceAuditFlowDto extends OaWorkflowDto implements Serializable
     private String storeId;
     private String flowId;
     private String flowName;
-    private String flowType;
+    private String auditType;
 
 
     private Date createTime;
@@ -69,14 +69,14 @@ public class ResourceAuditFlowDto extends OaWorkflowDto implements Serializable
         this.flowName = flowName;
     }
 
-    public String getFlowType() {
-        return flowType;
-    }
 
-    public void setFlowType(String flowType) {
-        this.flowType = flowType;
+    public String getAuditType() {
+        return auditType;
     }
 
+    public void setAuditType(String auditType) {
+        this.auditType = auditType;
+    }
 
     public Date getCreateTime() {
         return createTime;

java110-bean/src/main/java/com/java110/po/resource/ResourceAuditFlowPo.java

@@ -28,55 +28,66 @@ import java.io.Serializable;
 public class ResourceAuditFlowPo implements Serializable {
 
     private String rafId;
-private String remark;
-private String statusCd = "0";
-private String storeId;
-private String flowId;
-private String flowName;
-private String flowType;
-public String getRafId() {
+    private String remark;
+    private String statusCd = "0";
+    private String storeId;
+    private String flowId;
+    private String flowName;
+    private String auditType;
+
+    public String getRafId() {
         return rafId;
     }
-public void setRafId(String rafId) {
+
+    public void setRafId(String rafId) {
         this.rafId = rafId;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getFlowId() {
+
+    public String getFlowId() {
         return flowId;
     }
-public void setFlowId(String flowId) {
+
+    public void setFlowId(String flowId) {
         this.flowId = flowId;
     }
-public String getFlowName() {
+
+    public String getFlowName() {
         return flowName;
     }
-public void setFlowName(String flowName) {
+
+    public void setFlowName(String flowName) {
         this.flowName = flowName;
     }
-public String getFlowType() {
-        return flowType;
-    }
-public void setFlowType(String flowType) {
-        this.flowType = flowType;
-    }
-
 
+    public String getAuditType() {
+        return auditType;
+    }
 
+    public void setAuditType(String auditType) {
+        this.auditType = auditType;
+    }
 }

java110-db/src/main/resources/mapper/store/ResourceAuditFlowV1ServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存物品流程信息 add by wuxw 2018-07-03 -->
     <insert id="saveResourceAuditFlowInfo" parameterType="Map">
         insert into resource_audit_flow(
-        raf_id,remark,store_id,flow_id,flow_name,flow_type
+        raf_id,remark,store_id,flow_id,flow_name,audit_type
         ) values (
-        #{rafId},#{remark},#{storeId},#{flowId},#{flowName},#{flowType}
+        #{rafId},#{remark},#{storeId},#{flowId},#{flowName},#{auditType}
         )
     </insert>
 
@@ -18,7 +18,7 @@
     <!-- 查询物品流程信息 add by wuxw 2018-07-03 -->
     <select id="getResourceAuditFlowInfo" parameterType="Map" resultType="Map">
         select t.raf_id,t.raf_id rafId,t.remark,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id
-        storeId,t.flow_id,t.flow_id flowId,t.flow_name,t.flow_name flowName,t.flow_type,t.flow_type flowType,
+        storeId,t.flow_id,t.flow_id flowId,t.flow_name,t.flow_name flowName,t.audit_type,t.audit_type auditType,
         t.create_time createTime
         from resource_audit_flow t
         where 1 =1
@@ -40,8 +40,8 @@
         <if test="flowName !=null and flowName != ''">
             and t.flow_name= #{flowName}
         </if>
-        <if test="flowType !=null and flowType != ''">
-            and t.flow_type= #{flowType}
+        <if test="auditType !=null and auditType != ''">
+            and t.audit_type= #{auditType}
         </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
@@ -67,8 +67,8 @@
         <if test="flowName !=null and flowName != ''">
             , t.flow_name= #{flowName}
         </if>
-        <if test="flowType !=null and flowType != ''">
-            , t.flow_type= #{flowType}
+        <if test="auditType !=null and auditType != ''">
+            , t.audit_type= #{auditType}
         </if>
         where 1=1
         <if test="rafId !=null and rafId != ''">
@@ -103,8 +103,8 @@
         <if test="flowName !=null and flowName != ''">
             and t.flow_name= #{flowName}
         </if>
-        <if test="flowType !=null and flowType != ''">
-            and t.flow_type= #{flowType}
+        <if test="auditType !=null and auditType != ''">
+            and t.audit_type= #{auditType}
         </if>
 
 

service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveResourceAuditFlowCmd.java

@@ -86,7 +86,7 @@ public class SaveResourceAuditFlowCmd extends Cmd {
         oaWorkflowPo.setStoreId(storeId);
         oaWorkflowPo.setFlowId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_flowId));
         oaWorkflowPo.setFlowName(reqJson.getString("flowName"));
-        oaWorkflowPo.setFlowType(OaWorkflowDto.FLOW_TYPE_ITEM_RELEASE);
+        oaWorkflowPo.setFlowType(OaWorkflowDto.FLOW_TYPE_RESOURCE);
 
         //创建model
         WorkflowModelDto workflowModelDto = new WorkflowModelDto();