springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -184,14 +184,12 @@ List<ActivityInviteDTO> inviteList = comActActivityVO.getActivityInviteList(); if (!isEmpty(inviteList)) { List<ComActActivityInvite> inviteEntityList = new ArrayList<>(); inviteList.forEach(e -> { ComActActivityInvite inviteEntity = new ComActActivityInvite(); BeanUtils.copyProperties(e, inviteEntity); inviteEntity.setCreatedBy(comActActivityVO.getUserId()); inviteEntityList.add(inviteEntity); comActActivityInviteService.save(inviteEntity); }); comActActivityInviteService.saveBatch(inviteEntityList); } ComActNeighborCircleTopicWestDO topicWestDO = new ComActNeighborCircleTopicWestDO(); springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml
@@ -66,7 +66,7 @@ LEFT JOIN com_pb_check_unit as cpcu ON m.check_unit_id = cpcu.id LEFT JOIN com_mng_village cmv on m.village_id = cmv.village_id LEFT JOIN com_act ca on m.community_id = ca.community_id LEFT JOIN (select t1.user_id,sum(t.duration) as partyTime,sum(t.reward_integral) as partyInterval from com_act_activity t LEFT JOIN com_act_act_regist t1 on t.id = t1.activity_id where t.type = 3 LEFT JOIN (select t1.user_id,sum(t.duration) as partyTime,sum(t1.award) as partyInterval from com_act_activity t LEFT JOIN com_act_act_regist t1 on t.id = t1.activity_id where t1.sign_identity = 2 <if test="dto.startTime !=null"> and t.begin_at between #{dto.startTime} and #{dto.endTime} </if> @@ -138,7 +138,7 @@ LEFT JOIN com_pb_check_unit as cpcu ON m.check_unit_id = cpcu.id LEFT JOIN com_mng_village cmv on m.village_id = cmv.village_id LEFT JOIN com_act ca on m.community_id = ca.community_id LEFT JOIN (select t1.user_id,sum(t.duration) as partyTime,sum(t.reward_integral) as partyInterval from com_act_activity t LEFT JOIN com_act_act_regist t1 on t.id = t1.activity_id where t.type = 3 LEFT JOIN (select t1.user_id,sum(t.duration) as partyTime,sum(t1.award) as partyInterval from com_act_activity t LEFT JOIN com_act_act_regist t1 on t.id = t1.activity_id where t1.sign_identity = 2 <if test="dto.startTime !=null"> and t.begin_at between #{dto.startTime} and #{dto.endTime} </if> @@ -708,7 +708,7 @@ LEFT JOIN sys_user u ON m.id_card = u.id_card and u.type = 1 LEFT JOIN com_pb_org as cpo on cpo.id = m.org_id LEFT JOIN com_pb_check_unit as cpcu ON m.check_unit_id = cpcu.id LEFT JOIN (select t1.user_id,sum(t.duration) as partyTime,sum(t.reward_integral) as partyInterval from com_act_activity t LEFT JOIN com_act_act_regist t1 on t.id = t1.activity_id where t.type = 3 LEFT JOIN (select t1.user_id,sum(t.duration) as partyTime,sum(t1.award) as partyInterval from com_act_activity t LEFT JOIN com_act_act_regist t1 on t.id = t1.activity_id where t1.sign_identity = 2 GROUP BY t1.user_id ) t2 on u.user_id = t2.user_id where m.audit_result = 1 <if test="dto.checkUnitId != null"> springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberWestMapper.xml
@@ -75,7 +75,7 @@ LEFT JOIN com_act act ON u.community_id = act.community_id LEFT JOIN com_pb_org o ON m.org_id = o.id LEFT JOIN com_pb_check_unit as cpcu ON m.check_unit_id = cpcu.id LEFT JOIN (select t1.user_id,sum(t.duration) as partyTime,sum(t.reward_integral) as partyInterval from com_act_activity t LEFT JOIN com_act_act_regist t1 on t.id = t1.activity_id where t.type = 3 LEFT JOIN (select t1.user_id,sum(t.duration) as partyTime,sum(t1.award) as partyInterval from com_act_activity t LEFT JOIN com_act_act_regist t1 on t.id = t1.activity_id where t1.sign_identity = 2 <if test="dto.startTime !=null"> and t.begin_at between #{dto.startTime} and #{dto.endTime} </if> @@ -141,7 +141,7 @@ LEFT JOIN com_act act ON u.community_id = act.community_id LEFT JOIN com_pb_org o ON m.org_id = o.id LEFT JOIN com_pb_check_unit as cpcu ON m.check_unit_id = cpcu.id LEFT JOIN (select t1.user_id,sum(t.duration) as partyTime,sum(t.reward_integral) as partyInterval from com_act_activity t LEFT JOIN com_act_act_regist t1 on t.id = t1.activity_id where t.type = 3 LEFT JOIN (select t1.user_id,sum(t.duration) as partyTime,sum(t1.award) as partyInterval from com_act_activity t LEFT JOIN com_act_act_regist t1 on t.id = t1.activity_id where t1.sign_identity = 2 <if test="dto.startTime !=null"> and t.begin_at between #{dto.startTime} and #{dto.endTime} </if>