Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/resources/mapper/DailyReportMapper.xml

@@ -139,7 +139,7 @@
             1 'issueStatus'
         from
             settle_daily_import_summary_item c
-        join user aa on a.service_number = aa.worker_number AND aa.apply_type = 'WORKER'
+        join user aa on c.worker_number = aa.worker_number AND aa.apply_type = 'WORKER'
         join settle_daily_bank_account b  on  aa.id_card = b.idcard
         where
             c.summary_status != 1

mall-server-api/src/main/java/com/gree/mall/manager/enums/workorder/PoolStatusEnum.java

@@ -12,7 +12,8 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
 public enum PoolStatusEnum implements BaseEnum {
     YES("YES","已汇总"),
-    NO("NO","未汇总");
+    NO("NO","未汇总"),
+    NOT("NOT","已驳回");
 
     @EnumValue
     @JsonValue

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

@@ -104,7 +104,7 @@
         </if>
         and a.apply_type='WORKER'
         AND a.worker_number IS NOT NULL
-        <if test="isGroupByWorkerId != null and isGroupByWorkerId == true">
+        <if test="ex.isGroupByWorkerId != null and ex.isGroupByWorkerId == true">
             GROUP BY a.worker_number
         </if>
         ORDER BY FIELD(b.examine_status,'WAIT','OK','FAIL'),a.create_time DESC