仓库支持 模型查询

java110-bean/src/main/java/com/java110/dto/store/StorehouseDto.java

@@ -31,10 +31,13 @@ public class StorehouseDto extends PageDto implements Serializable {
 
     private String purchaseSwitch;
     private String purchaseRafId;
+    private String purchaseFlowId;
     private String useSwitch;
     private String useRafId;
+    private String useRafFlowId;
     private String allocationSwitch;
     private String allocationRafId;
+    private String allocationFlowId;
 
     private String purchaseFlowName;
     private String useFlowName;
@@ -178,4 +181,28 @@ public class StorehouseDto extends PageDto implements Serializable {
     public void setAllocationFlowName(String allocationFlowName) {
         this.allocationFlowName = allocationFlowName;
     }
+
+    public String getPurchaseFlowId() {
+        return purchaseFlowId;
+    }
+
+    public void setPurchaseFlowId(String purchaseFlowId) {
+        this.purchaseFlowId = purchaseFlowId;
+    }
+
+    public String getUseRafFlowId() {
+        return useRafFlowId;
+    }
+
+    public void setUseRafFlowId(String useRafFlowId) {
+        this.useRafFlowId = useRafFlowId;
+    }
+
+    public String getAllocationFlowId() {
+        return allocationFlowId;
+    }
+
+    public void setAllocationFlowId(String allocationFlowId) {
+        this.allocationFlowId = allocationFlowId;
+    }
 }

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

@@ -10,6 +10,7 @@
         storeId,t.is_show,t.is_show isShow,t.create_time createTime,t.purchase_switch purchaseSwitch,
         t.purchase_raf_id purchaseRafId,t.use_switch useSwitch,t.use_raf_id useRafId,
         t.allocation_switch allocationSwitch,t.allocation_raf_id allocationRafId,raf.flow_name purchaseFlowName,
+        raf.flow_id purchaseFlowId,raf1.flow_id useFlowId,raf2.flow_id allocationFlowId,
         raf1.flow_name useFlowName,raf2.flow_name allocationFlowName
         from storehouse t
         left join resource_audit_flow raf on t.purchase_raf_id = raf.raf_id and raf.status_cd = '0'

service-common/src/main/java/com/java110/common/cmd/workflow/GetFirstStaffCmd.java

@@ -22,6 +22,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * 查询审批人员
+ */
 @Java110Cmd(serviceCode = "/workflow/getFirstStaff")
 public class GetFirstStaffCmd extends Cmd {