From a20a150a0edadde7af7280a028c78924ffc3c802 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Mar 2023 09:32:12 +0800 Subject: [PATCH 01/14] search --- .../java/com/epmet/controller/IcPartyActivityController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java index 7e428aa6a0..e26bfa68cc 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java @@ -88,7 +88,7 @@ public class IcPartyActivityController implements ResultDataResolver { */ @PostMapping("search") public Result> page(@LoginUser TokenDto tokenDto,@RequestBody PartyActivityFormDTO formDTO){ - formDTO.setCustomerId(formDTO.getCustomerId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); PageData page = icPartyActivityService.search(formDTO); return new Result>().ok(page); } From 4e282fba1b57f5f535730fda9c4c301266eccb2d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Mar 2023 10:27:57 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=9A=E6=B4=BB=E5=8A=A8=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=81=E6=B4=BB=E5=8A=A8=E5=B0=81=E9=9D=A2?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcPartyActivityDTO.java | 15 +++++++++++++-- .../com/epmet/entity/IcPartyActivityEntity.java | 14 ++++++++++++-- .../main/resources/mapper/IcPartyActivityDao.xml | 4 +++- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java index 1217ea6875..39ed442ef3 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java @@ -110,17 +110,28 @@ public class IcPartyActivityDTO implements Serializable { private String content; /** - * 服务人数 + * 服务人数;烟台：服务人数是活动限制名额，如果是0代表不限制 */ private Integer peopleCount; /** - * 活动时间 + * 活动时间;烟台：此列作为活动开始时间 */ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern="yyyy-MM-dd HH:mm") private Date activityTime; + /** + * 烟台：此列作为活动结束时间;必填； + */ + private Date activityEndTime; + + /** + * 烟台：活动封面；必填 + */ + private String coverUrl; + + /** * 活动地址 */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java index 28a588f6f4..630e95732d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java @@ -83,14 +83,24 @@ public class IcPartyActivityEntity extends BaseEpmetEntity { private String content; /** - * 服务人数 + * 服务人数;烟台：服务人数是活动限制名额，如果是0代表不限制 */ private Integer peopleCount; /** - * 活动时间 + * 活动时间;烟台：此列作为活动开始时间 */ private Date activityTime; + /** + * 烟台：此列作为活动结束时间;必填； + */ + private Date activityEndTime; + + /** + * 烟台：活动封面；必填 + */ + private String coverUrl; + /** * 活动地址 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml index e142f3680f..c476109e35 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml @@ -63,7 +63,9 @@ a.LATITUDE, a.RESULT, a.AGENCY_ID, - a.CUSTOMER_ID + a.CUSTOMER_ID, + a.COVER_URL, + a.ACTIVITY_END_TIME FROM ic_party_activity a left join ic_activity_unit_relation ur From 6c6cb6809a9e42d03f3d0b6b74b28711f6349f1d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Mar 2023 10:37:42 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BA=E8=B0=83=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcPartyActivityDTO.java | 4 +++- .../com/epmet/excel/IcPartyActivityExcel.java | 13 ++++++++++++- .../excel/IcPartyActivityImportExcel.java | 13 +++++++++++-- .../templates/icpartyactivity_import_tem.xlsx | Bin 9049 -> 9067 bytes 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java index 39ed442ef3..e84928739d 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java @@ -118,12 +118,14 @@ public class IcPartyActivityDTO implements Serializable { * 活动时间;烟台：此列作为活动开始时间 */ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern="yyyy-MM-dd HH:mm") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date activityTime; /** * 烟台：此列作为活动结束时间;必填； */ + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date activityEndTime; /** diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java index 4b52917350..e7bdcaf3b8 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java @@ -49,9 +49,20 @@ public class IcPartyActivityExcel { private Integer peopleCount; @ColumnWidth(20) - @ExcelProperty(value = "活动时间") + @ExcelProperty(value = "活动开始时间") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date activityTime; + + + /** + * 烟台：此列作为活动结束时间;必填； + */ + @ColumnWidth(20) + @ExcelProperty(value = "活动结束时间") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date activityEndTime; + + /** * actId不为空小程序 * 为空管理平台 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityImportExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityImportExcel.java index 6998d20078..346993a2d0 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityImportExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityImportExcel.java @@ -51,11 +51,20 @@ public class IcPartyActivityImportExcel extends ExcelVerifyInfo { @ExcelProperty(value = "服务人数*") private Integer peopleCount; - @NotNull(message = "活动时间不能为空") - @ExcelProperty("活动时间*") + @NotNull(message = "活动开始时间不能为空") + @ExcelProperty("活动开始时间*") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date activityTime; + /** + * 烟台：此列作为活动结束时间;必填； + */ + @NotNull(message = "活动结束时间不能为空") + @ExcelProperty("活动结束时间*") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date activityEndTime; + + @NotBlank(message = "详细地址") @Length(max = 250, message = "详细地址最多输入250字") @ExcelProperty(value = "详细地址*") diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/icpartyactivity_import_tem.xlsx b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/icpartyactivity_import_tem.xlsx index 143cdaa637a7013aed8475a160f06aa52c6c1931..64188e8a2027f2e16bb90fca88e9963f654977b1 100644 GIT binary patch delta 1607 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 From d335ac2e6c39a5b9b88984e98cc1ca2cf81622e9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Mar 2023 10:40:22 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcPartyActivityDao.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml index c476109e35..1d7d847e1e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml @@ -91,8 +91,11 @@ AND sr.SERVICE_MATTER = #{serviceMatter} - - AND a.ACTIVITY_TIME BETWEEN #{startTime} AND #{endTime} + + AND a.ACTIVITY_TIME >= #{startTime} + + + AND a.ACTIVITY_TIME <= #{endTime} GROUP BY a.id ORDER BY a.ACTIVITY_TIME DESC From a5969a4ec315e7147eeb29e233cbdebcdb01edc0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Mar 2023 12:47:04 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E5=A2=9E=E5=8A=A0=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/icpartyactivity_import_tem.xlsx | Bin 9067 -> 9102 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/icpartyactivity_import_tem.xlsx b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/icpartyactivity_import_tem.xlsx index 64188e8a2027f2e16bb90fca88e9963f654977b1..a17cefb94107796e1116ec7e600507add3c31682 100644 GIT binary patch delta 4688 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 delta 4653 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 From 5dd8aeb23b03e4fb2271d28cab66e8ca5ed90acb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Mar 2023 13:55:25 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PartyActivitySignUpRecordFormDTO.java | 22 +++++++ .../PartyActivitySignUpRecordResDTO.java | 61 +++++++++++++++++++ .../controller/IcPartyActivityController.java | 16 +++++ .../dao/IcPartyActivitySignUpRecordDao.java | 24 ++++++++ .../IcPartyActivitySignUpRecordEntity.java | 54 ++++++++++++++++ .../epmet/service/IcPartyActivityService.java | 8 +++ .../impl/IcPartyActivityServiceImpl.java | 21 ++++++- .../mapper/IcPartyActivitySignUpRecordDao.xml | 37 +++++++++++ 8 files changed, 242 insertions(+), 1 deletion(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivitySignUpRecordFormDTO.java create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyActivitySignUpRecordResDTO.java create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivitySignUpRecordDao.java create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivitySignUpRecordEntity.java create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivitySignUpRecordDao.xml diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivitySignUpRecordFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivitySignUpRecordFormDTO.java new file mode 100644 index 0000000000..bb4dcc834f --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivitySignUpRecordFormDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 人员名单 + * @Author yzm + * @Date 2023/3/29 13:42 + */ +@Data +public class PartyActivitySignUpRecordFormDTO extends PageFormDTO implements Serializable { + /** + * 联建活动ID + */ + @NotBlank(message = "activityId不能为空", groups = AddUserInternalGroup.class) + private String activityId; +} + diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyActivitySignUpRecordResDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyActivitySignUpRecordResDTO.java new file mode 100644 index 0000000000..6151e149dc --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyActivitySignUpRecordResDTO.java @@ -0,0 +1,61 @@ +package com.epmet.dto.result; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 联建活动报名记录表(烟台需求) + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-03-29 + */ +@Data +public class PartyActivitySignUpRecordResDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户id + */ + private String customerId; + + /** + * 联建活动ID + */ + private String activityId; + + /** + * 居民端用户id + */ + private String userId; + + /** + * 姓名 + */ + private String userName; + private String mobile; + /** + * 报名时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date signUpTime; + + /** + * 用户报名时所在的网格 + */ + private String gridId; + /** + * 网格名称：XXX社区-xxx网格 + */ + private String gridName; + +} \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java index e26bfa68cc..189954215f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java @@ -24,6 +24,7 @@ import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -39,7 +40,9 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcPartyActivityDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.form.PartyActivityFormDTO; +import com.epmet.dto.form.PartyActivitySignUpRecordFormDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; +import com.epmet.dto.result.PartyActivitySignUpRecordResDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.excel.IcPartyActivityExcel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; @@ -253,5 +256,18 @@ public class IcPartyActivityController implements ResultDataResolver { } } + /** + * 人员名单 + * + * @param formDTO + * @return + */ + @PostMapping("querySignUpRecord") + public Result> querySignUpRecord(@RequestBody PartyActivitySignUpRecordFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserShowGroup.class,PageFormDTO.AddUserInternalGroup.class); + return new Result>().ok(icPartyActivityService.querySignUpRecord(formDTO.getActivityId(),formDTO.getPageNo(),formDTO.getPageSize())); + } + + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivitySignUpRecordDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivitySignUpRecordDao.java new file mode 100644 index 0000000000..a28ec3565a --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivitySignUpRecordDao.java @@ -0,0 +1,24 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.PartyActivitySignUpRecordResDTO; +import com.epmet.entity.IcPartyActivitySignUpRecordEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 联建活动报名记录表(烟台需求) + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-03-29 + */ +@Mapper +public interface IcPartyActivitySignUpRecordDao extends BaseDao { + /** + * 人员名单 + * @param activityId + * @return + */ + List querySignUpRecord(String activityId); +} \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivitySignUpRecordEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivitySignUpRecordEntity.java new file mode 100644 index 0000000000..4917b0adf6 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivitySignUpRecordEntity.java @@ -0,0 +1,54 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 联建活动报名记录表(烟台需求) + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-03-29 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_party_activity_sign_up_record") +public class IcPartyActivitySignUpRecordEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 联建活动ID + */ + private String activityId; + + /** + * 居民端用户id + */ + private String userId; + + /** + * 姓名 + */ + private String userName; + private String mobile; + /** + * 报名时间 + */ + private Date signUpTime; + + /** + * 用户报名时所在的网格 + */ + private String gridId; + private String gridName; +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java index 22c559aace..16166ca26d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java @@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcPartyActivityDTO; import com.epmet.dto.form.PartyActivityFormDTO; +import com.epmet.dto.result.PartyActivitySignUpRecordResDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.IcPartyActivityEntity; @@ -127,4 +128,11 @@ public interface IcPartyActivityService extends BaseService querySignUpRecord(String activityId,Integer pageNo,Integer pageSize); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index 180877f027..3f5681547d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -33,11 +33,13 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.*; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcPartyActivityDao; +import com.epmet.dao.IcPartyActivitySignUpRecordDao; import com.epmet.dto.IcPartyActivityDTO; import com.epmet.dto.IcPartyUnitDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.form.PartyActivityFormDTO; import com.epmet.dto.result.ActivityStatisticsDTO; +import com.epmet.dto.result.PartyActivitySignUpRecordResDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.IcActivityServiceRelationEntity; @@ -57,6 +59,7 @@ import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -93,6 +96,8 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl(dtoList, pageInfo.getTotal()); + return new PageData<>(dtoList, pageInfo.getTotal(),formDTO.getPageSize()); } @Override @@ -509,4 +514,18 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl querySignUpRecord(String activityId, Integer pageNo, Integer pageSize) { + PageHelper.startPage(pageNo, pageSize); + List list = partyActivitySignUpRecordDao.querySignUpRecord(activityId); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal(), pageSize); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivitySignUpRecordDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivitySignUpRecordDao.xml new file mode 100644 index 0000000000..d0b9f998a6 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivitySignUpRecordDao.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 5af9229dea509ba879fbcf6de252d048b8adf27f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Mar 2023 14:12:40 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/IcPartyActivitySignUpRecordDao.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivitySignUpRecordDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivitySignUpRecordDao.xml index d0b9f998a6..c28b63da6c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivitySignUpRecordDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivitySignUpRecordDao.xml @@ -21,6 +21,9 @@ + select u.UNIT_NAME from ic_party_unit u + where u.id in( + select r.UNIT_ID from ic_activity_unit_relation r + where r.ACTIVITY_ID=#{activityId} + and r.DEL_FLAG='0' + ) + \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceItemDictDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceItemDictDao.xml index 4582741dbb..8359370be2 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceItemDictDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceItemDictDao.xml @@ -41,4 +41,19 @@ d.CUSTOMER_ID = #{customerId} AND d.CATEGORY_CODE = #{categoryCode} + + + \ No newline at end of file From 2c1acc7af8e6c6ea248a13d41b542fe6912f184c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Mar 2023 16:58:04 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E6=80=BB=E4=BA=BA?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcPartyActivityServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index c0a8b816ee..8e0ab3ac4d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -617,7 +617,7 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl countWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(IcPartyActivitySignUpRecordEntity::getActivityId, activityId); + countWrapper.eq(IcPartyActivitySignUpRecordEntity::getActivityId, activityId); resDTO.setSignUpCount(partyActivitySignUpRecordDao.selectCount(countWrapper)); return resDTO; } From 082efc43875329307ff992034d0bff2937ed3f3a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Mar 2023 17:42:04 +0800 Subject: [PATCH 11/14] =?UTF-8?q?baoming=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/PartyActivityFormDTO.java | 16 +++++++- .../controller/IcPartyActivityController.java | 16 ++++++++ .../com/epmet/dao/IcPartyActivityDao.java | 14 +++++++ .../epmet/service/IcPartyActivityService.java | 11 +++++ .../impl/IcPartyActivityServiceImpl.java | 28 ++++++++++++- .../resources/mapper/IcPartyActivityDao.xml | 40 +++++++++++++++++++ 6 files changed, 123 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java index 76f6d485db..76fef2c33b 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java @@ -18,8 +18,16 @@ import java.util.Date; @Data public class PartyActivityFormDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = -2510068555703677L; - @NotBlank(message = "组织Id不能为空" ) + + public interface ResiDingQueryInternalGroup { + } + + + @NotBlank(message = "组织Id不能为空",groups = {ResiDingQueryInternalGroup.class}) private String agencyId; + + @NotBlank(message = "gridId不能为空",groups = {ResiDingQueryInternalGroup.class}) + private String gridId; private String unitId; private String title; @@ -31,4 +39,10 @@ public class PartyActivityFormDTO extends PageFormDTO implements Serializable { // private Integer pageNo; // private Integer pageSize; private String customerId; + + /** + * 居民端钉钉，传userId + */ + @NotBlank(message = "userId不能为空",groups = {ResiDingQueryInternalGroup.class}) + private String userId; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java index 34a74214c4..2c6c6917e3 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java @@ -300,4 +300,20 @@ public class IcPartyActivityController implements ResultDataResolver { return new Result().ok(icPartyActivityService.queryActDetailForResi(tokenDto.getCustomerId(),tokenDto.getUserId(),activityId)); } + /** + * 居民端钉钉，分页查询联建活动 + * + * @param formDTO + * @return + */ + @PostMapping("page-all-act") + public Result> pageAllAct(@RequestBody PartyActivityFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, PartyActivityFormDTO.ResiDingQueryInternalGroup.class); + return new Result>().ok( + icPartyActivityService.pageAllAct(formDTO.getPageNo(), + formDTO.getPageSize(), + formDTO.getGridId(), + formDTO.getAgencyId(), + formDTO.getUserId())); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java index c8fba2ffed..2027a97c68 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java @@ -20,8 +20,10 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.form.PartyActivityFormDTO; import com.epmet.dto.result.ActivityStatisticsDTO; +import com.epmet.dto.result.PartyActivityResDTO; import com.epmet.entity.IcPartyActivityEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -54,4 +56,16 @@ public interface IcPartyActivityDao extends BaseDao { List getActivityList(PartyActivityFormDTO formDTO); + + /** + * + * @param gridId 当前用户所在网格id + * @param agencyId 当前用户所在网格所属组织id + * @param userId 居民端用户id,校验当前用户是否报名 + * @return 居民端钉钉-分页查询全部联建活动 + */ + List pageAllAct(@Param("customerId")String customerId, + @Param("gridId") String gridId, + @Param("agencyId")String agencyId, + @Param("userId")String userId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java index 1cd0819acf..b93f8f56ee 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java @@ -153,4 +153,15 @@ public interface IcPartyActivityService extends BaseService pageAllAct(Integer pageNo, Integer pageSize, String gridId, String agencyId,String userId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index 8e0ab3ac4d..b93b2efa4c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -623,5 +623,31 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl pageAllAct(Integer pageNo, Integer pageSize, String gridId,String agencyId, String userId) { + PageHelper.startPage(pageNo,pageSize); + List list=baseDao.pageAllAct(EpmetRequestHolder.getLoginUserCustomerId(),gridId,agencyId,userId); + list.forEach(resDTO->{ + // 主办方:组织名称 + AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(resDTO.getAgencyId()); + if (null != agencyInfoCache) { + resDTO.setAgencyName(agencyInfoCache.getOrganizationName()); + } + // 联建单位： + resDTO.setUnitNameList(icActivityUnitRelationService.getActivityUntiNames(resDTO.getActivityId())); + // 服务事项 + resDTO.setServiceMatterNameList(SpringContextUtils.getBean(IcServiceItemDictService.class).getByActivityId(resDTO.getActivityId(),EpmetRequestHolder.getLoginUserCustomerId())); + }); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml index 1d7d847e1e..524dbbbe59 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml @@ -164,4 +164,44 @@ + + \ No newline at end of file From 1eeb5609ad5ea73d012356f893d247d3212d7081 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Mar 2023 17:42:59 +0800 Subject: [PATCH 12/14] =?UTF-8?q?baoming=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcPartyActivityServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index b93b2efa4c..8513ea5f03 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -648,6 +648,6 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl pageInfo = new PageInfo<>(list); - return new PageData<>(list, pageInfo.getTotal()); + return new PageData<>(list, pageInfo.getTotal(),pageSize); } } From dabf87287fd2683c78995b013c725fb868e8c816 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Mar 2023 09:25:54 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E5=B7=B2=E6=8A=A5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcPartyActivityController.java | 17 ++++++++ .../com/epmet/dao/IcPartyActivityDao.java | 13 +++++++ .../epmet/service/IcPartyActivityService.java | 15 +++++++ .../impl/IcPartyActivityServiceImpl.java | 29 ++++++++++++++ .../resources/mapper/IcPartyActivityDao.xml | 39 +++++++++++++++++++ 5 files changed, 113 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java index 2c6c6917e3..0ed2488b12 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java @@ -316,4 +316,21 @@ public class IcPartyActivityController implements ResultDataResolver { formDTO.getAgencyId(), formDTO.getUserId())); } + + /** + * 居民端钉钉，已报名列表 + * @param formDTO + * @return + */ + @PostMapping("applied-act") + public Result> appliedAct(@RequestBody PartyActivityFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, PartyActivityFormDTO.ResiDingQueryInternalGroup.class); + return new Result>().ok( + icPartyActivityService.appliedAct(formDTO.getPageNo(), + formDTO.getPageSize(), + formDTO.getGridId(), + formDTO.getAgencyId(), + formDTO.getUserId())); + } + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java index 2027a97c68..23e764e4ec 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java @@ -68,4 +68,17 @@ public interface IcPartyActivityDao extends BaseDao { @Param("gridId") String gridId, @Param("agencyId")String agencyId, @Param("userId")String userId); + + /** + * 居民端钉钉，已报名列表 + * @param customerId + * @param gridId + * @param agencyId + * @param userId + * @return + */ + List selectAppliedAct(@Param("customerId")String customerId, + @Param("gridId") String gridId, + @Param("agencyId")String agencyId, + @Param("userId")String userId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java index b93f8f56ee..41f597fb07 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java @@ -164,4 +164,19 @@ public interface IcPartyActivityService extends BaseService pageAllAct(Integer pageNo, Integer pageSize, String gridId, String agencyId,String userId); + + /** + * 居民端钉钉，已报名列表 + * @param pageNo + * @param pageSize + * @param gridId + * @param agencyId + * @param userId + * @return + */ + PageData appliedAct(Integer pageNo, + Integer pageSize, + String gridId, + String agencyId, + String userId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index 8513ea5f03..70996fe308 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -650,4 +650,33 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal(),pageSize); } + + /** + * 居民端钉钉，已报名列表 + * + * @param pageNo + * @param pageSize + * @param gridId + * @param agencyId + * @param userId + * @return + */ + @Override + public PageData appliedAct(Integer pageNo, Integer pageSize, String gridId, String agencyId, String userId) { + PageHelper.startPage(pageNo, pageSize); + List list = baseDao.selectAppliedAct(EpmetRequestHolder.getLoginUserCustomerId(), gridId, agencyId, userId); + list.forEach(resDTO -> { + // 主办方:组织名称 + AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(resDTO.getAgencyId()); + if (null != agencyInfoCache) { + resDTO.setAgencyName(agencyInfoCache.getOrganizationName()); + } + // 联建单位： + resDTO.setUnitNameList(icActivityUnitRelationService.getActivityUntiNames(resDTO.getActivityId())); + // 服务事项 + resDTO.setServiceMatterNameList(SpringContextUtils.getBean(IcServiceItemDictService.class).getByActivityId(resDTO.getActivityId(), EpmetRequestHolder.getLoginUserCustomerId())); + }); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal(), pageSize); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml index 524dbbbe59..8ae5aca768 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml @@ -204,4 +204,43 @@ ) order by a.ACTIVITY_END_TIME desc,a.CREATED_TIME desc + + + + + \ No newline at end of file From 78be98f049aa162ff8416daa85e554cadc1b6edd Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Mar 2023 10:34:09 +0800 Subject: [PATCH 14/14] /heart/icpartyactivity/search --- .../src/main/resources/mapper/IcPartyActivityDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml index 8ae5aca768..0d96fac179 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml @@ -52,7 +52,7 @@ a.ACT_ID, a.GRID_ID, ur.UNIT_ID, - GROUP_CONCAT( sr.SERVICE_MATTER ) AS serviceMatter, + GROUP_CONCAT( distinct sr.SERVICE_MATTER ) AS serviceMatter, a.TITLE, a.TARGET, a.CONTENT,