审批获取ApproveType

hx-service/storage/src/main/java/com/fjhx/applet/controller/FabricStatisticsController.java

@@ -128,7 +128,7 @@ public class FabricStatisticsController {
     }
 
     /**
-     * 审批数量
+     * 审批分页
      */
     @PostMapping("/flowPage")
     public R flowPage(@RequestBody Map<String, String> condition) {
@@ -136,4 +136,13 @@ public class FabricStatisticsController {
         return R.success(map);
     }
 
+    /**
+     * 获取ApproveType
+     */
+    @PostMapping("/getApproveType")
+    public R getApproveType(@RequestBody Map<String, String> condition) {
+        Integer result = fabricStatisticsService.getApproveType(condition);
+        return R.data(result);
+    }
+
 }

hx-service/storage/src/main/java/com/fjhx/applet/mapper/FabricStatisticsMapper.java

@@ -51,4 +51,7 @@ public interface FabricStatisticsMapper extends BaseMapper<BaseEntity> {
     @TenantIgnore
     Page<Map<String, Object>> flowPage(@Param("page") Page<Map<String, Object>> page, @Param("ew") QueryWrapper<?> wrapper);
 
+    @TenantIgnore
+    Integer getApproveType(@Param("sql") String sql);
+
 }

hx-service/storage/src/main/java/com/fjhx/applet/mapper/FabricStatisticsMapper.xml

@@ -169,11 +169,25 @@
     </select>
 
     <select id="flowPage" resultType="java.util.Map">
-        select fa.ID           id,
-               f.FlowName      flowName,
-               fa.ApprovalItem approvalItem,
-               fa.CreatedTime  createdTime,
-               fa.CheckState   checkState
+        select fa.ID           flowChekId,
+               fa.ApprovalItem dealWithItem,
+               fa.CreatedTime  createTime,
+               fa.CheckState   checkState,
+               CASE
+                   fa.CheckState
+                   WHEN 0 THEN
+                       '已发起'
+                   WHEN 1 THEN
+                       '待审批'
+                   WHEN 2 THEN
+                       '审批通过'
+                   WHEN 3 THEN
+                       '审批驳回'
+                   END         checkStateStr,
+               fa.LinkId       linkId,
+               f.ModelName     modelName,
+               f.DealWithType  dealWithType,
+               f.FlowName      dealWithTypeStr
         from flow f
                  left join
              (
@@ -186,4 +200,8 @@
             ${ew.customSqlSegment}
     </select>
 
+    <select id="getApproveType" resultType="java.lang.Integer">
+        ${sql}
+    </select>
+
 </mapper>

hx-service/storage/src/main/java/com/fjhx/applet/service/FabricStatisticsService.java

@@ -30,4 +30,6 @@ public interface FabricStatisticsService extends BaseService<BaseEntity> {
 
     Page<Map<String, Object>> flowPage(Map<String, String> condition);
 
+    Integer getApproveType(Map<String, String> condition);
+
 }

hx-service/storage/src/main/java/com/fjhx/applet/service/impl/FabricStatisticsServiceImpl.java

@@ -393,6 +393,62 @@ public class FabricStatisticsServiceImpl extends ServiceImpl<FabricStatisticsMap
         return baseMapper.flowPage(createPageMap(condition), wrapper);
     }
 
+    @Override
+    public Integer getApproveType(Map<String, String> condition) {
+        String modelName = condition.get("modelName");
+        String linkId = condition.get("linkId");
+
+        if (!ObjectUtil.isAllNotEmpty(modelName, linkId)) {
+            throw new ServiceException("modelName 或 linkId 不为空");
+        }
+
+        switch (modelName) {
+            case "PurchaseContract":
+                return null;
+            case "PurchaseContractDel":
+                modelName = "purchase_Contractdel";
+                break;
+            case "StockExemptCheck":
+                modelName = "Stock_exemptcheck";
+                break;
+            case "SupplierShipApply":
+                modelName = "supplier_shipapply";
+                break;
+            case "ApplyPurchasePay":
+                modelName = "apply_purchase_pay";
+                break;
+            case "ApplyTake":
+                modelName = "apply_take";
+                break;
+            case "ApplyStockOut":
+                modelName = "apply_stockout";
+                break;
+            case "ApplyPurchase":
+                modelName = "apply_purchase";
+                break;
+            case "ApplyStockBack":
+                modelName = "apply_stockback";
+                break;
+            case "ApplyMaterialEdit":
+                modelName = "apply_materialedit";
+                break;
+            case "SupplierPriceChange":
+                modelName = "supplier_pricechange";
+                break;
+            case "StockCheckRecordDetail":
+                modelName = "stock_checkrecorddetail";
+                break;
+            case "StockCheckQtyAdjust":
+                modelName = "stock_checkqtyadjust";
+                break;
+        }
+
+
+        String sql = "select ApproveBillState from " + modelName + " where ID = '" + linkId + "'";
+
+        return baseMapper.getApproveType(sql);
+    }
+
     private WrapperUtil getFlowWrapper(Map<String, String> condition) {
         return WrapperUtil.init(condition)
                 .periodOfTime("fa.CreatedTime")

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockWaterMapper.xml

@@ -153,6 +153,7 @@
                  left join stock_area sa on sd.PlaceAreaId = sa.ID
                  left join stock_tag st on sd.RfidCode = st.RfidCode
         where sd.MaterialCode = #{materialCode}
+          and st.IsDelete = 0
         order by sd.CreatedTime
     </select>