合并

src/main/java/com/huiju/estateagents/controller/HelpActivityController.java

@@ -89,8 +89,8 @@ public class HelpActivityController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query", value = "城市"),
             @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query", value = "项目"),
             @ApiImplicitParam(dataTypeClass = String.class, name = "title", paramType = "query", value = "标题"),
-            @ApiImplicitParam(dataTypeClass = Data.class, name = "startDate", paramType = "query", value = "活动开始时间"),
-            @ApiImplicitParam(dataTypeClass = Data.class, name = "endDate", paramType = "query", value = "活动结束时间"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "startDate", paramType = "query", value = "活动开始时间"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "endDate", paramType = "query", value = "活动结束时间"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "activityStatus", paramType = "query", value = "活动状态")
     })
     @RequestMapping(value = "admin/helpActivity/list", method = RequestMethod.GET)
@@ -99,8 +99,8 @@ public class HelpActivityController extends BaseController {
                                          @RequestParam(value = "cityId", required = false) Integer cityId,
                                          @RequestParam(value = "buildingId", required = false) String buildingId,
                                          @RequestParam(value = "title", required = false) String title,
-                                         @RequestParam(value = "startDate", required = false) Data startDate,
-                                         @RequestParam(value = "endDate", required = false) Data endDate,
+                                         @RequestParam(value = "startDate", required = false) String startDate,
+                                         @RequestParam(value = "endDate", required = false) String endDate,
                                          @RequestParam(value = "activityStatus", required = false) Integer activityStatus,
                                          HttpServletRequest request) {
         Integer orgId = getOrgId(request);

src/main/java/com/huiju/estateagents/mapper/HelpActivityMapper.java

@@ -30,5 +30,5 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
      * @param orgId
      * @return
      */
-    IPage<HelpActivity> helpActivityListPage(IPage<HelpActivity> pg, @Param("cityId")Integer cityId, @Param("buildingId")String buildingId, @Param("title")String title, @Param("startDate")Data startDate, @Param("endDate") Data endDate, @Param("activityStatus")Integer activityStatus, @Param("orgId")Integer orgId);
+    IPage<HelpActivity> helpActivityListPage(IPage<HelpActivity> pg, @Param("cityId")Integer cityId, @Param("buildingId")String buildingId, @Param("title")String title, @Param("startDate")String startDate, @Param("endDate") String endDate, @Param("activityStatus")Integer activityStatus, @Param("orgId")Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/IHelpActivityService.java

@@ -32,7 +32,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, Data startDate, Data endDate, Integer activityStatus, Integer orgId);
+    ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId);
 
     /**
      * 活动助力添加

src/main/java/com/huiju/estateagents/service/impl/HelpActivityServiceImpl.java

@@ -45,7 +45,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     HelpRecordMapper helpRecordMapper;
 
     @Override
-    public ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, Data startDate, Data endDate, Integer activityStatus, Integer orgId) {
+    public ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId) {
         ResponseBean responseBean = new ResponseBean<>();
         IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
         IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListPage(pg, cityId, buildingId, title, startDate, endDate, activityStatus, orgId);
@@ -127,6 +127,11 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     public ResponseBean helpInitiateRecordVerify(Integer helpRecordInitiateId, Integer verifyCode) {
         ResponseBean responseBean = new ResponseBean<>();
         HelpInitiateRecord helpInitiateRecord = helpInitiateRecordMapper.selectById(helpRecordInitiateId);
+        if (null ==verifyCode || "".equals(verifyCode)){
+            responseBean.addError("请输入核销码");
+            return responseBean;
+        }
+
         // 判断是否已核销
         if ("1".equals(helpInitiateRecord.getVerificationStatus())){
             responseBean.addSuccess("已核销");
@@ -138,7 +143,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
             helpInitiateRecordMapper.updateById(helpInitiateRecord);
             responseBean.addSuccess("成功");
         }else {
-            responseBean.addError("核销码错误");
+            responseBean.addError("核销码错误,请重新输入");
         }
         return responseBean;
     }

src/main/resources/mapper/HelpActivityMapper.xml

@@ -13,7 +13,11 @@
         <if test="title != null and title != ''">
             and title = #{title}
         </if>
-        <if test="startDate != null and endDate != null">
+        <if test="startDate != null and startDate != ''and startDate!='Invalid date'">
+         and date_format(start_date,'%Y-%m-%d') = date_format( #{startDate}, '%Y-%m-%d' )
+        </if>
+        <if test="endDate != null and endDate != ''and endDate!='Invalid date'">
+            and date_format(end_date,'%Y-%m-%d') = date_format( #{endDate}, '%Y-%m-%d' )
         </if>
         <if test="activityStatus != null and activityStatus != null">
             and activity_status = #{activityStatus}