列表返回分组名称

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmQrcodeListDTO.java

@@ -79,6 +79,7 @@ public class HmQrcodeListDTO implements Serializable {
      * 活码分组
      */
     private Long hmGroupId;
+    private String hmGroupName;
     /**
      * 新增总人数
      */
@@ -319,4 +320,12 @@ public class HmQrcodeListDTO implements Serializable {
     public void setStoreList(List<HmStoreDTO> storeList) {
         this.storeList = storeList;
     }
+
+    public String getHmGroupName() {
+        return hmGroupName;
+    }
+
+    public void setHmGroupName(String hmGroupName) {
+        this.hmGroupName = hmGroupName;
+    }
 }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmQrcodeController.java

 package com.gic.haoban.manage.web.controller.hm;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.logging.log4j.LogManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
+import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
@@ -21,18 +10,14 @@ import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.api.constants.StatisticsApolloKeyConstant;
-import com.gic.haoban.manage.api.dto.hm.HmClerkDTO;
-import com.gic.haoban.manage.api.dto.hm.HmClerkRelationDTO;
-import com.gic.haoban.manage.api.dto.hm.HmQrcodeDTO;
-import com.gic.haoban.manage.api.dto.hm.HmQrcodeListDTO;
-import com.gic.haoban.manage.api.dto.hm.HmStoreDTO;
-import com.gic.haoban.manage.api.dto.hm.WxUserAddLogDTO;
+import com.gic.haoban.manage.api.dto.hm.*;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeListQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogSearchQDTO;
 import com.gic.haoban.manage.api.dto.statistics.StatisticsDTO;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
+import com.gic.haoban.manage.api.service.hm.HmGroupApiService;
 import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
 import com.gic.haoban.manage.api.service.hm.WxUserAddLogApiService;
 import com.gic.haoban.manage.api.util.DataHttpUtil;
@@ -45,8 +30,17 @@ import com.gic.haoban.manage.web.qo.hm.data.HmQrcodeListQO;
 import com.gic.haoban.manage.web.qo.hm.data.HmTrendQO;
 import com.gic.haoban.manage.web.vo.hm.HmDetailClerkListVO;
 import com.gic.haoban.manage.web.vo.hm.HmTrendVO;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.logging.log4j.LogManager;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
-import cn.hutool.core.convert.Convert;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 活码(TabHaobanHmQrcode)表控制层
@@ -68,6 +62,8 @@ public class HmQrcodeController {
     private WxUserAddLogApiService wxUserAddLogApiService;
     @Autowired
     private StaffClerkRelationApiService staffClerkRelationApiService;
+    @Autowired
+    private HmGroupApiService hmGroupApiService;
 
     /**
      * 新增
@@ -201,6 +197,12 @@ public class HmQrcodeController {
                         }
                     }
                 }
+
+                ServiceResponse<HmGroupDTO> hmGroupDTOServiceResponse = hmGroupApiService.queryGroupDetail(hmQrcodeListDTO.getHmGroupId());
+                HmGroupDTO hmGroupDTO = hmGroupDTOServiceResponse.getResult();
+                if (hmGroupDTO != null) {
+                    hmQrcodeListDTO.setHmGroupName(hmGroupDTO.getGroupName());
+                }
                 hmQrcodeListDTO.setClerkList(clerkDTOList);
                 hmQrcodeListDTO.setStoreList(storeDTOList);
             }