优化代码

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

@@ -36,6 +36,10 @@ public class StorehouseDto extends PageDto implements Serializable {
     private String allocationSwitch;
     private String allocationRafId;
 
+    private String purchaseFlowName;
+    private String useFlowName;
+    private String allocationFlowName;
+
     public String getShDesc() {
         return shDesc;
     }
@@ -150,4 +154,28 @@ public class StorehouseDto extends PageDto implements Serializable {
     public void setAllocationRafId(String allocationRafId) {
         this.allocationRafId = allocationRafId;
     }
+
+    public String getPurchaseFlowName() {
+        return purchaseFlowName;
+    }
+
+    public void setPurchaseFlowName(String purchaseFlowName) {
+        this.purchaseFlowName = purchaseFlowName;
+    }
+
+    public String getUseFlowName() {
+        return useFlowName;
+    }
+
+    public void setUseFlowName(String useFlowName) {
+        this.useFlowName = useFlowName;
+    }
+
+    public String getAllocationFlowName() {
+        return allocationFlowName;
+    }
+
+    public void setAllocationFlowName(String allocationFlowName) {
+        this.allocationFlowName = allocationFlowName;
+    }
 }

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

@@ -9,8 +9,12 @@
         shId,t.status_cd,t.status_cd statusCd,t.sh_name,t.sh_name shName,t.store_id,t.store_id
         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
+        t.allocation_switch allocationSwitch,t.allocation_raf_id allocationRafId,raf.flow_name purchaseFlowName,
+        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'
+        left join resource_audit_flow raf1 on t.use_raf_id = raf1.raf_id and raf1.status_cd = '0'
+        left join resource_audit_flow raf2 on t.allocation_raf_id = raf2.raf_id and raf2.status_cd = '0'
         where 1 =1
         <if test="shDesc !=null and shDesc != ''">
             and t.sh_desc= #{shDesc}