Merge branch 'feature/社群' into 'developer'

统计

See merge request !731

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatDataMapper.xml

@@ -124,8 +124,8 @@
 		resultType="com.gic.haoban.manage.api.dto.chat.GroupChatDataDTO">
 		SELECT 
 		  staffId,  staffName,  `date`,  chatTotal,  memberTotal,
-		  SUM(newChatCnt),  SUM(chatHasMsg),  SUM(newMemberCnt),
-		  SUM(memberHasMsg),  SUM(msgTotal) 
+		  SUM(newChatCnt) newChatCnt,  SUM(chatHasMsg) chatHasMsg,  SUM(newMemberCnt) newMemberCnt,
+		  SUM(memberHasMsg) memberHasMsg,  SUM(msgTotal)  msgTotal
 		FROM
 		  (SELECT 
 		    b.staff_name staffName,    a.staff_id staffId,   a.date `date`,

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatDataController.java

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
@@ -39,6 +40,7 @@ public class GroupChatDataController {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = loginUser.getWxEnterpriseId();
         qdto.setWxEnterpriseId(wxEnterpriseId);
+        qdto.setStartDate(DateUtil.getStartTimeOfDay(qdto.getStartDate()));
         ServiceResponse<GroupChatDataDTO> resp = this.groupChatDataApiService.listTotalData(qdto);
         GroupChatDataVO vo = EntityUtil.changeEntityByJSON(GroupChatDataVO.class, resp.getResult());
         return RestResponse.successResult(vo);
@@ -49,6 +51,7 @@ public class GroupChatDataController {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = loginUser.getWxEnterpriseId();
         qdto.setWxEnterpriseId(wxEnterpriseId);
+        qdto.setStartDate(DateUtil.getStartTimeOfDay(qdto.getStartDate()));
         ServiceResponse<List<GroupChatDataDTO>> resp = this.groupChatDataApiService.listForChat(qdto);
         List<GroupChatDataVO> list = EntityUtil.changeEntityListByJSON(GroupChatDataVO.class, resp.getResult());
         return RestResponse.successResult(list);
@@ -59,6 +62,7 @@ public class GroupChatDataController {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = loginUser.getWxEnterpriseId();
         qdto.setWxEnterpriseId(wxEnterpriseId);
+        qdto.setStartDate(DateUtil.getStartTimeOfDay(qdto.getStartDate()));
         ServiceResponse<Page<GroupChatDataDTO>> resp = this.groupChatDataApiService.listStaffData(qdto, basePageInfo);
         Page<GroupChatDataDTO> page = resp.getResult();
         List<GroupChatDataVO> list = EntityUtil.changeEntityListByJSON(GroupChatDataVO.class, page.getResult());