feat: 开票审核页也需要加个字段“积分包类型”

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/service/impl/SysDeptInvoiceServiceImpl.java

@@ -26,6 +26,7 @@ import com.qunzhixinxi.hnqz.admin.recharge.entity.SysDeptInvoiceRelation;
 import com.qunzhixinxi.hnqz.admin.recharge.entity.SysDeptRecharge;
 import com.qunzhixinxi.hnqz.admin.recharge.enums.InvoiceApprovalStatus;
 import com.qunzhixinxi.hnqz.admin.recharge.enums.InvoiceStatus;
+import com.qunzhixinxi.hnqz.admin.recharge.enums.RechargeRecordType;
 import com.qunzhixinxi.hnqz.admin.recharge.mapper.SysDeptInvoiceMapper;
 import com.qunzhixinxi.hnqz.admin.recharge.mapper.SysDeptInvoiceRelationMapper;
 import com.qunzhixinxi.hnqz.admin.recharge.mapper.SysDeptRechargeMapper;
@@ -54,6 +55,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -310,12 +312,32 @@ public class SysDeptInvoiceServiceImpl extends ServiceImpl<SysDeptInvoiceMapper,
         List<SysDept> depts = deptService.listByIds(deptIds);
         Map<Integer, String> deptMap = depts.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getName));
 
+        // 查询积分记录
+        List<WmScorePackage> scorePackages = scorePackageMapper.selectBatchIds(packageIds);
+        Map<String, WmScorePackage> scorePackageMap = new HashMap<>();
+        if (CollUtil.isNotEmpty(scorePackages)) {
+            scorePackageMap = scorePackages.stream().collect(Collectors.toMap(WmScorePackage::getId, Function.identity()));
+        }
+
         Map<String, String> finalPackageUsersMap = packageUsersMap;
+        Map<String, WmScorePackage> finalScorePackageMap = scorePackageMap;
         records.forEach(vo -> {
             vo.setDeptName(deptMap.getOrDefault(vo.getDeptId(), ""));
             vo.setTaskUsers(finalPackageUsersMap.getOrDefault(vo.getScorePackageId(), ""));
             vo.setInvoiceStatusStr(vo.getInvoiceStatus().getDescription());
             vo.setScorePackageStatusStr(Objects.requireNonNull(ScorePackageStatusEnum.getByVal(vo.getScorePackageStatus())).getDesc());
+            WmScorePackage scorePackage = finalScorePackageMap.get(vo.getScorePackageId());
+            if (scorePackage != null) {
+                if ("3".equals(scorePackage.getTypeid()) || "4".equals(scorePackage.getTypeid())) {
+                    vo.setType(RechargeRecordType.SEND_PACKAGE_PERSONAL);
+                    vo.setTypeStr(RechargeRecordType.SEND_PACKAGE_PERSONAL.getDescription());
+                } else {
+                    vo.setType(RechargeRecordType.SEND_PACKAGE_DEPT);
+                    vo.setTypeStr(RechargeRecordType.SEND_PACKAGE_DEPT.getDescription());
+                }
+            } else {
+                vo.setTypeStr("");
+            }
         });
 
         return relationVOIPage;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/vo/SysDeptInvoiceRelationVO.java

@@ -1,6 +1,7 @@
 package com.qunzhixinxi.hnqz.admin.recharge.vo;
 
 import com.qunzhixinxi.hnqz.admin.recharge.enums.InvoiceStatus;
+import com.qunzhixinxi.hnqz.admin.recharge.enums.RechargeRecordType;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -81,6 +82,16 @@ public class SysDeptInvoiceRelationVO implements Serializable {
      */
     private String invoiceStatusStr = InvoiceStatus.NOT_APPLY.getDescription();
 
+    /**
+     * 操作类型
+     */
+    private RechargeRecordType type;
+
+    /**
+     * 操作类型名称
+     */
+    private String typeStr;
+
     /**
      * 开票时间
      */