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 1/4] 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 2/4] =?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 3/4] =?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 4/4] =?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