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

退群人查询

See merge request !685

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/chat/GroupChatUserDTO.java

@@ -55,8 +55,18 @@ public class GroupChatUserDTO implements Serializable{
 	private Integer adminFlag ;
 	private String chatName ;
 	private String staffName ;
+	private String wxChatId ;
 	
-	public String getChatName() {
+	
+	public String getWxChatId() {
+        return wxChatId;
+    }
+
+    public void setWxChatId(String wxChatId) {
+        this.wxChatId = wxChatId;
+    }
+
+    public String getChatName() {
         return chatName;
     }
 

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

@@ -173,6 +173,7 @@
 	<select id="listPage" parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatUserSearchQDTO" resultType="com.gic.haoban.manage.api.dto.chat.GroupChatUserDTO">
 		select 
 			b.name chatName ,
+			b.wx_chat_id wxChatId ,
 			c.staff_name staffName ,
 			a.chat_user_id chatUserId ,
 			a.user_type userType ,
@@ -203,7 +204,7 @@
 				and a.user_quit_time <![CDATA[>=]]> #{startDate} and a.user_quit_time <![CDATA[<=]]> #{endDate}
 			</if>
 			<if test="null != searchParams">
-				and (b.name like '%${searchParams}%' or c.staff_name like '%${searchParams}%')
+				and (b.name like '%${searchParams}%' or c.staff_name like '%${searchParams}%' or b.wx_chat_id like '${searchParams}%')
 			</if>
 		</if>
 		<if test="null != userType">

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

@@ -80,9 +80,11 @@ public class GroupChatHmController {
     @GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.HB_QHM, optType = GicLogRecordOptTypeEnum.HB_1002_01, userFunc = LogRecordUserServiceImpl.class, optPage = "群活码-新建活码")
     public RestResponse<Object> save(@RequestBody GroupChatHmDTO dto) {
         if (CollectionUtils.isEmpty(dto.getChatIdList())) {
+            GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("1", "请选择加入的群");
         }
         if (dto.getChatIdList().size() > 4) {
+            GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("1", "最多可选4个群");
         }
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
@@ -99,6 +101,7 @@ public class GroupChatHmController {
             GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
             return RestResponse.successResult();
         }
+        GicLogRecordEvaluationContext.noWriteLog();
         return RestResponse.failure("1", resp.getMessage());
     }
 
@@ -246,6 +249,7 @@ public class GroupChatHmController {
     @GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.HB_QHM, optType = GicLogRecordOptTypeEnum.HB_1002_03, userFunc = LogRecordUserServiceImpl.class, optPage = "群活码")
     public RestResponse<Object> discard(Long chatHmId, @RequestParam(defaultValue = "0") int page) {
         if (null == chatHmId) {
+            GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("1", "群活码ID空");
         }
         // 判断是否关联链接
@@ -265,6 +269,7 @@ public class GroupChatHmController {
             GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
             return RestResponse.successResult();
         }
+        GicLogRecordEvaluationContext.noWriteLog();
         return RestResponse.failure("1", resp.getMessage());
     }
 

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

@@ -69,6 +69,7 @@ public class GroupChatPlanController {
     @GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.HB_QF, optType = GicLogRecordOptTypeEnum.HB_1000_01, userFunc = LogRecordUserServiceImpl.class, optPage = "客户群群发")
     public RestResponse<Object> save(@RequestBody GroupChatPlanDTO dto) {
         if (StringUtils.isBlank(dto.getStaffIdList())) {
+            GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("9999", "请选择群主");
         }
         logger.info("新增参数={}", JSON.toJSONString(dto));
@@ -90,10 +91,12 @@ public class GroupChatPlanController {
     @GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.HB_QF, optType = GicLogRecordOptTypeEnum.HB_1000_04, userFunc = LogRecordUserServiceImpl.class, optPage = "客户群群发")
     public RestResponse<Object> del(Long planId) {
         if (null == planId) {
+            GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("9999", "计划ID空");
         }
         ServiceResponse<GroupChatPlanDTO> planResp = this.groupChatPlanApiService.detail(planId);
         if (!planResp.isSuccess()) {
+            GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("1", "计划不存在");
         }
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
@@ -117,10 +120,12 @@ public class GroupChatPlanController {
     @GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.HB_QF, optType = GicLogRecordOptTypeEnum.HB_1000_03, userFunc = LogRecordUserServiceImpl.class, optPage = "客户群群发")
     public RestResponse<Object> stop(Long planId) {
         if (null == planId) {
+            GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("9999", "计划ID空");
         }
         ServiceResponse<GroupChatPlanDTO> planResp = this.groupChatPlanApiService.detail(planId);
         if (!planResp.isSuccess()) {
+            GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("1", "计划不存在");
         }
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
@@ -138,15 +143,19 @@ public class GroupChatPlanController {
         ServiceResponse<GroupChatPlanDTO> oldResp = this.groupChatPlanApiService.detail(dto.getPlanId());
         GroupChatPlanDTO oldPlan = oldResp.getResult();
         if (null == oldPlan) {
+            GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("9999", "计划不存在");
         }
         if (oldPlan.getSendType() == 1) {
+            GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("9999", "已发送的不能编辑");
         }
         if (null != oldPlan.getSendTime() && oldPlan.getSendTime().before(new Date())) {
+            GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("9999", "已发送的不能编辑");
         }
         if (oldPlan.getStartTime().before(new Date())) {
+            GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("9999", "进行中的不能编辑");
         }
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();