月租车登记回访

src/main/java/com/qmrb/system/controller/MonthlyParkingRegistrationController.java

@@ -3,10 +3,15 @@ package com.qmrb.system.controller;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.qmrb.system.framework.security.util.SecurityUtils;
+import com.qmrb.system.pojo.entity.MonthlyParkingRegistration;
 import com.qmrb.system.pojo.query.UserPageQuery;
 import com.qmrb.system.pojo.vo.MonthlyParkingRegistrationExcelVO;
 import com.qmrb.system.pojo.vo.UserExportVO;
@@ -108,6 +113,27 @@ public class MonthlyParkingRegistrationController{
         boolean result = monthlyParkingRegistrationService.updateForm(id,form);
         return Result.judge(result);
     }
+    
+    
+    @Operation(summary = "修改月租车登记信息表", security = {@SecurityRequirement(name = "Authorization")})
+    @PostMapping(value = "/chatBack")
+    public Result<?> chatBack(
+            @RequestBody Map<String,String> map) {
+        String ids = map.get("ids");
+        if(StrUtil.isBlank(ids)) {
+            return Result.failed(ResultCode.PARAM_ERROR, "删除的月租车登记信息表数据为空");
+        }
+        // 逻辑删除
+        List<Long> idList = Arrays.asList(ids.split(",")).stream()
+                .map(idStr -> Long.parseLong(idStr)).collect(Collectors.toList());
+        LambdaUpdateWrapper<MonthlyParkingRegistration> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.set(MonthlyParkingRegistration::getRevisitFlag,1);//回访标记（0-未回访 1-已回访 2-需再次回访）
+        updateWrapper.set(MonthlyParkingRegistration::getRevisitTime,new Date());
+        updateWrapper.set(MonthlyParkingRegistration::getRevisitOperator, SecurityUtils.getUserId());
+        updateWrapper.in(MonthlyParkingRegistration::getId,idList);
+        boolean result = monthlyParkingRegistrationService.update(updateWrapper);
+        return Result.judge(result);
+    }
 
     @Operation(summary = "删除月租车登记信息表", security = {@SecurityRequirement(name = "Authorization")})
     @DeleteMapping("/{ids}")

src/main/java/com/qmrb/system/pojo/entity/MonthlyParkingRegistration.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * <p>
  * 月租车登记信息表
@@ -76,6 +78,23 @@ public class MonthlyParkingRegistration extends BaseEntity {
      */
     @TableField("remark")
     private String remark;
+    
+    /**
+     * 回访标记（0-未回访 1-已回访 2-需再次回访
+     */
+    @TableField("revisit_flag")
+    private Integer revisitFlag; 
+    /**
+     * 最近回访时间
+     */
+    @TableField("revisit_time")
+    private Date revisitTime;
+    /**
+     * 回访操作员
+     */
+    @TableField("revisit_operator")
+    private String revisitOperator;
 
 
+    
 }

src/main/java/com/qmrb/system/pojo/form/MonthlyParkingRegistrationForm.java

@@ -1,8 +1,11 @@
 package com.qmrb.system.pojo.form;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * <p>
  * 月租车登记信息表表单
@@ -61,4 +64,19 @@ public class MonthlyParkingRegistrationForm {
     private String remark;
 
 
+    /**
+     * 回访标记（0-未回访 1-已回访 2-需再次回访
+     */
+    @Schema(description = "回访标记",type="Integer")
+    private Integer revisitFlag;
+    /**
+     * 最近回访时间
+     */
+    @Schema(description = "最近回访时间",type="Date")
+    private Date revisitTime;
+    /**
+     * 回访操作员
+     */
+    @Schema(description = "回访操作员",type="String")
+    private String revisitOperator;
 }

src/main/java/com/qmrb/system/pojo/query/CouponQuery.java

@@ -98,5 +98,9 @@ public class CouponQuery extends BasePageQuery{
 	@Schema(description = "优惠券类型(1-金额券, 2-时长券)",type="Integer")
     private Integer couponType;
 
-
+    @Schema(description="生效时间开始")
+    private String effectiveTimeBegin;
+    
+    @Schema(description="生效时间结束")
+    private String effectiveTimeEnd;
 }

src/main/java/com/qmrb/system/pojo/query/MonthlyParkingRegistrationQuery.java

@@ -5,6 +5,8 @@ import com.qmrb.system.common.base.BasePageQuery;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * <p>
  * 月租车登记信息表查询对象
@@ -66,5 +68,19 @@ public class MonthlyParkingRegistrationQuery extends BasePageQuery{
 	@Schema(description = "备注信息",type="String")
     private String remark;
 
-
+    /**
+     * 回访标记（0-未回访 1-已回访 2-需再次回访
+     */
+    @Schema(description = "回访标记",type="Integer")
+    private Integer revisitFlag;
+    /**
+     * 最近回访时间
+     */
+    @Schema(description = "最近回访时间",type="Date")
+    private Date revisitTime;
+    /**
+     * 回访操作员
+     */
+    @Schema(description = "回访操作员",type="String")
+    private String revisitOperator;
 }

src/main/java/com/qmrb/system/pojo/vo/MonthlyParkingRegistrationVO.java

@@ -1,6 +1,7 @@
 package com.qmrb.system.pojo.vo;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -70,5 +71,20 @@ public class MonthlyParkingRegistrationVO {
 	@Schema(description = "子分类")
     private List<MonthlyParkingRegistrationVO> children;
 
-
+    /**
+     * 回访标记（0-未回访 1-已回访 2-需再次回访
+     */
+    @Schema(description = "回访标记",type="Integer")
+    private Integer revisitFlag;
+    /**
+     * 最近回访时间
+     */
+    @Schema(description = "最近回访时间",type="Date")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date revisitTime;
+    /**
+     * 回访操作员
+     */
+    @Schema(description = "回访操作员",type="String")
+    private String revisitOperator;
 }

src/main/java/com/qmrb/system/service/impl/CouponServiceImpl.java

@@ -85,6 +85,8 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
                 new Page<>(pageNum, pageSize),
                 new LambdaQueryWrapper<Coupon>()
                         .eq(status != null, Coupon::getStatus, status)
+                        .le(StrUtil.isNotBlank(queryParams.getEffectiveTimeEnd()),Coupon::getEffectiveTime,queryParams.getEffectiveTimeEnd())
+                        .ge(StrUtil.isNotBlank(queryParams.getEffectiveTimeBegin()),Coupon::getEffectiveTime,queryParams.getEffectiveTimeBegin())
                 //.like(StrUtil.isNotBlank(keywords), Coupon::getCategoryName, keywords)
         );
 

src/main/java/com/qmrb/system/service/impl/MonthlyParkingRegistrationServiceImpl.java

@@ -1,5 +1,6 @@
 package com.qmrb.system.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.qmrb.system.pojo.vo.MonthlyParkingRegistrationExcelVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -46,7 +47,10 @@ public class MonthlyParkingRegistrationServiceImpl extends ServiceImpl<MonthlyPa
         // 查询数据
         Page<MonthlyParkingRegistration> dictItemPage = this.page(
                 new Page<>(pageNum, pageSize),
-                new LambdaQueryWrapper<MonthlyParkingRegistration>().orderByDesc(MonthlyParkingRegistration::getCreateTime)
+                new LambdaQueryWrapper<MonthlyParkingRegistration>()
+						.eq(StrUtil.isNotBlank(queryParams.getCarType()),MonthlyParkingRegistration::getCarType,queryParams.getCarType())
+						.eq(queryParams.getRevisitFlag() != null,MonthlyParkingRegistration::getRevisitFlag,queryParams.getRevisitFlag())
+						.orderByDesc(MonthlyParkingRegistration::getCreateTime)
                 	//.like(StrUtil.isNotBlank(keywords), MonthlyParkingRegistration::getCategoryName, keywords)
         );