合伙人bug修改

partner/src/main/java/com/jzg/mapper/PartnerLiftingRecordMapper.java

@@ -17,8 +17,8 @@ import java.util.Map;
 public interface PartnerLiftingRecordMapper extends BaseMapper<PartnerLiftingRecord> {
 
 
-    @Select("select audit_status as auditStatus,count(1) as count from partner_lifting_record group by audit_status")
-    List<Map<String, Object>> groupByAuditStatus();
+    @Select("SELECT type,audit_status,COUNT(*) AS total FROM partner_lifting_record GROUP BY type,audit_status ORDER BY type,audit_status")
+    List<Map<String, String>> groupByAuditStatus();
 
     @Select("SELECT r.id,r.`name`,r.mobile,r.user_id,r.dept_id,r.type,r.original_level,r.after_change,r.cycle,r.upgrade_strategy,r.audit_status,r.audit_time,r.audit_user,r.reject_reason,r.conditions, " +
             " r.rules,r.create_time,r.upgrade_type,( SELECT `name` FROM sys_dept WHERE sys_dept.id = r.dept_id ) dept_name , " +

partner/src/main/java/com/jzg/service/Impl/PartnerLiftingRecordServiceImpl.java

@@ -74,11 +74,7 @@ public class PartnerLiftingRecordServiceImpl extends ServiceImpl<PartnerLiftingR
         queryWrapper.like(StringUtils.isNotBlank(recordParam.getMobile()), "mobile", recordParam.getMobile());
         queryWrapper.like(StringUtils.isNotBlank(recordParam.getUserId()), "user_id", recordParam.getUserId());
         queryWrapper.eq(StringUtils.isNotBlank(recordParam.getType()), "type", recordParam.getType());
-        if (1 == recordParam.getAuditStatus()){
-            queryWrapper.in(ObjectUtils.isNotEmpty(recordParam.getAuditStatus()), "audit_status", 1,3,4);
-        }else {
-            queryWrapper.eq(ObjectUtils.isNotEmpty(recordParam.getAuditStatus()), "audit_status", recordParam.getAuditStatus());
-        }
+        queryWrapper.eq(ObjectUtils.isNotEmpty(recordParam.getAuditStatus()), "audit_status", recordParam.getAuditStatus());
         if (CollectionUtil.isNotEmpty(recordParam.getApplyTime())){
             String startTime = recordParam.getApplyTime().get(0);
             String endTime = null;
@@ -101,40 +97,20 @@ public class PartnerLiftingRecordServiceImpl extends ServiceImpl<PartnerLiftingR
 
     }
 
-    public List<Map<String, Integer>> groupByAuditStatus() {
-        List<Map<String, Object>> maps = baseMapper.groupByAuditStatus();
-        List<Map<String, Integer>> list = new ArrayList<>();
-        Arrays.asList(0, 1, 2).forEach(auditStatus -> {
-            Map<String, Integer> statusMap = new HashMap<>();
-            int sum;
-            if (1 == auditStatus) {
-                sum = maps.stream()
-                        .filter(map -> {
-                            Object auditStatusObj = map.get("auditStatus");
-                            return auditStatusObj != null &&
-                                    (Integer.valueOf(String.valueOf(auditStatusObj)) == 3 ||
-                                            Integer.valueOf(String.valueOf(auditStatusObj)) == 1);
-                        }).mapToInt(map -> {
-                            Object countObj = map.get("count");
-                            return countObj instanceof Long ? ((Long) countObj).intValue() : 0;
-                        })
-                        .sum();
-            } else {
-                sum = maps.stream()
-                        .filter(map -> {
-                            Object auditStatusObj = map.get("auditStatus");
-                            return auditStatusObj != null &&
-                                    Integer.valueOf(String.valueOf(auditStatusObj)) == auditStatus;
-                        }).mapToInt(map -> {
-                            Object countObj = map.get("count");
-                            return countObj instanceof Long ? ((Long) countObj).intValue() : 0;
-                        })
-                        .sum();
+    public List<Map<String, String>> groupByAuditStatus() {
+        List<Map<String, String>> maps = baseMapper.groupByAuditStatus();
+        List<Map<String, String>> list = new ArrayList<>();
+        for (Map<String, String> map : maps) {
+            Map<String, String> statusMap = new HashMap<>();
+            String type = String.valueOf(map.get("type"));
+            String auditStatus = String.valueOf(map.get("audit_status"));
+            String total = String.valueOf(map.get("total"));
+            if (StringUtils.equalsAny(type, "0", "1") && StringUtils.equalsAny(auditStatus, "0", "1", "2", "3")) {
+                statusMap.put("auditStatus", type + auditStatus);
+                statusMap.put("count", total);
             }
-            statusMap.put("auditStatus", auditStatus);
-            statusMap.put("count", sum);
             list.add(statusMap);
-        });
+        }
         return list;
     }
 

tenant/organization/src/main/resources/mapper/SysUserJzgInfoMapper.xml

@@ -321,7 +321,7 @@
             su.identity_time_end,
             (select GROUP_CONCAT(type_attr SEPARATOR ',' ) from sys_user_jzg_info_salesman where sys_user_jzg_info_id = suji.id) as partnerTypeAttr,
             IF(EXISTS ( SELECT id FROM sys_user_jzg_info_salesman  WHERE type_attr = 3 AND sys_user_jzg_info_id = suji.id),
-                    (SELECT GROUP_CONCAT(grade SEPARATOR ',' ) FROM partner_user WHERE user_id = suji.user_id), NULL ) AS gradeList
+                    (SELECT GROUP_CONCAT(grade SEPARATOR ',' ) FROM partner_user WHERE grade IN (1,2,3,4) and user_id = suji.id), NULL ) AS gradeList
         FROM
             sys_user_jzg_info suji
                 LEFT JOIN sys_user su ON suji.user_id = su.id