no message

mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/repair/WorkerWaitBuckleVO.java

@@ -1,6 +1,7 @@
 package com.gree.mall.manager.bean.settle.repair;
 
 import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.enums.repair.settle.CostTypeEnum;
 import com.gree.mall.manager.enums.repair.settle.IsBuckleEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -35,7 +36,7 @@ public class WorkerWaitBuckleVO {
     private String mobile;
 
     @ApiModelProperty("费用项目名称")
-    private String costType;
+    private CostTypeEnum costType;
 
     @ApiModelProperty("费用金额")
     private BigDecimal buckleAmount;

mall-server-api/src/main/java/com/gree/mall/manager/enums/repair/settle/CostTypeEnum.java

@@ -0,0 +1,29 @@
+package com.gree.mall.manager.enums.repair.settle;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.gree.mall.manager.enums.base.BaseEnum;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public enum CostTypeEnum implements BaseEnum{
+    REDUCE_DAILY("REDUCE_DAILY","需扣回费用"),
+    INCR_DECR_DAILY("INCR_DECR_DAILY","增减费用"),
+    INSURANCE_DAILY("INSURANCE_DAILY","残保金"),
+    EMP_RESIDUAL_DAILY("EMP_RESIDUAL_DAILY","单工伤保险"),
+
+    ;
+
+
+    @JsonValue
+    @EnumValue
+    private final String key;
+    private final String remark;
+
+
+
+
+}

mall-server-api/src/main/java/com/gree/mall/manager/logic/settle/repair/DailyImportSummaryLogic.java

@@ -520,10 +520,8 @@ public class DailyImportSummaryLogic {
             return issue;
         }
         List<SettleDailyRemaineBuckle> buckles = settleDailyRemaineBuckleService.lambdaQuery()
-                //.eq(DailyRemaineBuckle::getWorkerNumber,issue.getServiceNumber())
                 .eq(SettleDailyRemaineBuckle::getCompanyWechatId, adminUser.getAdminCompanyWechat().getCompanyWechatId())
                 .eq(SettleDailyRemaineBuckle::getIdcard, issue.getIdCard())
-                //.eq(DailyRemaineBuckle::getSummaryNumber,issue.getSummaryNumber())
                 .eq(SettleDailyRemaineBuckle::getIsBuckle, false)
                 .list();
         if (CollectionUtils.isEmpty(buckles)) {

mall-server-api/src/main/resources/mapper/DailyMapper.xml

@@ -71,13 +71,13 @@
         a.websit_name,
         a.company_wechat_id,
         a.company_wechat_name,
-        sum(a.total_fee) 'total_fee',
-        count(a.dispatch_order_no) as repairCount,
-        a.repair_worker_mobile 'mobile'
+        sum(a.total_fee) AS 'total_fee',
+        count(a.dispatch_order_no) AS repairCount,
+        a.repair_worker_mobile AS 'mobile'
         from settle_daily_import_summary_item a
-        join (select DISTINCT c.worker_number,a.idcard from settle_daily_bank_account a
-        join user b on a.idcard=b.id_card
-        join websit_user c on b.user_id=c.user_id) b on a.worker_number=b.worker_number
+        join (
+            select DISTINCT a.worker_number, a.idcard from settle_daily_bank_account a
+        ) b on a.worker_number=b.worker_number
         where
         company_wechat_id = #{companyWechatId}
         <if test="status != null and status.size()> 0">