指标考核关于我的考核列表查询修复

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java

@@ -30,7 +30,6 @@ public class IndicatorsEntity  extends TenantEntity {
 	private Long classifyId;
 
 
-
 	@ApiModelProperty(value = "分数")
 	private int point;
 

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml

@@ -67,8 +67,8 @@
         sc.NAME AS classifyName
         FROM
         sup_indicators AS si
-        LEFT JOIN sup_classify AS sc ON si.classify_id = sc.id
+        LEFT JOIN sup_classify AS sc ON si.classify_id = sc.id AND sc.is_deleted = 0
-        WHERE si.assess_dept = #{params.deptId} AND si.is_deleted = 0 AND sc.is_deleted = 0
+        WHERE si.assess_dept = #{params.deptId} AND si.is_deleted = 0
         <if test="params.startTime != null and params.startTime != ''" >
             AND date_format(si.create_time,'%y%m%d%') >= date_format(#{params.startTime},'%y%m%d%')
         </if>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.xml

@@ -103,7 +103,8 @@
         GROUP_CONCAT(ldpl.waybill_number) AS waybillNumber,
         ldsa.total_number AS totalNumber,
         sum(lwusa.num) AS totalNum,
-        IF(ldsa.total_number = sum( lwusa.num ),1,0) AS complete
+        IF(ldsa.total_number = sum( lwusa.num ),1,0) AS complete,
+        2 AS goodsType
         FROM
         logpm_warehouse_updown_stockup_area AS lwusa
         LEFT JOIN logpm_distribution_parcel_list AS ldpl ON lwusa.association_id = ldpl.id
@@ -115,14 +116,16 @@
     </select>
     <select id="selectStockUpAreaStockList" resultType="java.util.Map">
         SELECT
-        lwusa.materiel_code,
+        lwusa.materiel_code AS materielCode,
-        lwusa.materiel_name,
+        lwusa.materiel_name AS materielName,
-        ldsl.quantity_stock,
+        ldsl.quantity_stock AS quantityStock,
-        ldsl.order_code,
+        ldsl.order_code AS orderCode,
-        ldsl.market_name,
+        ldsl.market_name AS marketName,
-        lwusa.market_id,
+        lwusa.market_id AS  marketId,
-        lwusa.incoming_batch,
+        lwusa.incoming_batch AS incomingBatch,
-        sum(lwusa.num)
+        sum(lwusa.num) AS  totalNum,
+        if(ldsl.quantity_stock = sum(lwusa.num),1,0) AS complete,
+        3 AS goodsType
         FROM
         logpm_warehouse_updown_stockup_area AS lwusa
         LEFT JOIN logpm_distribution_stock_list AS ldsl ON lwusa.association_value = ldsl.cargo_number