供应商

hx-service-api/storage-api/src/main/java/com/fjhx/entity/supplier/Supplier.java

@@ -215,6 +215,12 @@ public class Supplier extends BasicEntity {
     private Integer warningCount;
 
     /**
+     * 问题反馈类型总条数
+     */
+    @TableField(exist = false)
+    private Integer warningTypeCount;
+
+    /**
      * 物料类型名称
      */
     @TableField(exist = false)

hx-service-api/storage-api/src/main/java/com/fjhx/entity/supplier/SupplierProblem.java

@@ -51,6 +51,12 @@ public class SupplierProblem extends BasicEntity {
     private String problemType;
 
     /**
+     * 问题类型条数
+     */
+    @TableField("ProblemTypeCount")
+    private String problemTypeCount;
+
+    /**
      * 备注信息
      */
     @TableField("Remark")

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.stock.StockWater;
 import org.apache.ibatis.annotations.Param;
+import org.springblade.core.tenant.annotation.TenantIgnore;
 
 import java.util.List;
 import java.util.Map;
@@ -19,22 +20,31 @@ import java.util.Map;
  */
 public interface StockWaterMapper extends BaseMapper<StockWater> {
 
+    @TenantIgnore
     List<Map<String, Object>> getPickingStatistics(@Param("ew") QueryWrapper<?> wrapper);
 
+    @TenantIgnore
     Map<String, Integer> getPickingStockChangeTypeCount(@Param("ew") QueryWrapper<?> wrapper);
 
+    @TenantIgnore
     Page<Map<String, Object>> getPickingPage(@Param("page") Page<StockWater> page, @Param("ew") QueryWrapper<?> wrapper);
 
+    @TenantIgnore
     List<Map<String, Object>> contractPaymentStatistics(@Param("ew") QueryWrapper<?> wrapper);
 
+    @TenantIgnore
     Page<Map<String, Object>> subscriptionAmountPage(@Param("page") Page<StockWater> page, @Param("ew") QueryWrapper<?> wrapper);
 
+    @TenantIgnore
     List<Map<String, Object>> remainingToday();
 
+    @TenantIgnore
     Page<Map<String, Object>> remainingTodayPage(@Param("page") Page<StockWater> page, @Param("ew") QueryWrapper<?> wrapper);
 
+    @TenantIgnore
     List<Map<String, Object>> selectMaterialHouse(@Param("ew") QueryWrapper<Object> wrapper);
 
+    @TenantIgnore
     List<String> selectMaterialIdByHouseId(@Param("houseId") String houseId);
 
 }

hx-service/storage/src/main/java/com/fjhx/supplier/mapper/SupplierMapper.xml

@@ -11,6 +11,7 @@
             t4.`Name` AS materialCategoryName,
             t4.ID,
             ( SELECT count( 1 ) FROM supplier_problem WHERE SupplierId = t1.id ) AS warningCount,
+            ( SELECT SUM(ProblemTypeCount) FROM supplier_problem WHERE SupplierId = t1.id ) AS warningTypeCount,
             (select `Name` from material_category where `Code` = t1.CategoryCode) AS categoryName
         FROM
             supplier t1
@@ -39,6 +40,7 @@
             t3.TechnologyType AS TechnologyType,
             t3.Purpose AS purpose,
             ( SELECT count( 1 ) FROM supplier_problem WHERE SupplierId = t1.id ) AS warningCount,
+            ( SELECT SUM(ProblemTypeCount) FROM supplier_problem WHERE SupplierId = t1.id ) AS warningTypeCount,
             FORMAT(IFNULL((<include refid="sumMoney_filed"/>),0),2)AS sumMoney,
             FORMAT(IFNULL((<include refid="lastYearMoney_filed"/>),0),2)AS lastYearMoney,
             FORMAT(IFNULL((<include refid="yearMoney_filed"/>),0),2)AS yearMoney,