Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java

@@ -110,17 +110,30 @@ 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")
+    @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;
+
+    /**
+     * 烟台：活动封面；必填
+     */
+    private String coverUrl;
+
+
     /**
      * 活动地址
      */

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<PageData<IcPartyActivityDTO>> page(@LoginUser TokenDto tokenDto,@RequestBody PartyActivityFormDTO formDTO){
-        formDTO.setCustomerId(formDTO.getCustomerId());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         PageData<IcPartyActivityDTO> page = icPartyActivityService.search(formDTO);
         return new Result<PageData<IcPartyActivityDTO>>().ok(page);
     }

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;
+
 
     /**
      * 活动地址

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不为空小程序
      * 为空管理平台

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 = "详细地址*")

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
@@ -89,8 +91,11 @@
             <if test='null != serviceMatter and "" != serviceMatter'>
                 AND sr.SERVICE_MATTER = #{serviceMatter}
             </if>
-            <if test=" null != startTime and null != endTime">
-                AND a.ACTIVITY_TIME BETWEEN #{startTime} AND #{endTime}
+            <if test=" null != startTime">
+                AND a.ACTIVITY_TIME &gt;= #{startTime}
+            </if>
+            <if test=" null != endTime">
+                AND a.ACTIVITY_TIME &lt;= #{endTime}
             </if>
             GROUP BY a.id
         ORDER BY a.ACTIVITY_TIME DESC