From 5f37e5d2342daf6c7411a315b00bf8a653fb29bb Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Fri, 10 Jun 2022 10:01:44 +0800 Subject: [PATCH] zh --- .../controller/manage/TaskController.java | 2 +- .../controller/wxApp/TaskUController.java | 19 ++++++++++++++----- .../mapper/CustomerActionNoteMapper.java | 6 ++++-- .../project0512/model/CustomerActionNote.java | 8 +++++--- .../com/zh/project0512/utils/CustomUtil.java | 18 +++++++++++------- 5 files changed, 35 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zh/project0512/controller/manage/TaskController.java b/src/main/java/com/zh/project0512/controller/manage/TaskController.java index 1f75a3b..1274275 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TaskController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TaskController.java @@ -223,7 +223,7 @@ public class TaskController { static class ListTParam { private int pageNum; private int pageSize; - @Schema(title = "任务状态") + @Schema(title="任务状态",description = "0未上线；1已上线；2已结束") private Integer status; @Schema(title = "月份区间") private Integer month; diff --git a/src/main/java/com/zh/project0512/controller/wxApp/TaskUController.java b/src/main/java/com/zh/project0512/controller/wxApp/TaskUController.java index 2c50840..6902c54 100644 --- a/src/main/java/com/zh/project0512/controller/wxApp/TaskUController.java +++ b/src/main/java/com/zh/project0512/controller/wxApp/TaskUController.java @@ -29,6 +29,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; import java.time.LocalDateTime; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -68,7 +69,7 @@ public class TaskUController { static class ListTParam { private int pageNum; private int pageSize; - @Schema(title = "任务状态") + @Schema(title="任务状态",description = "0未上线；1已上线；2已结束") private Integer status; @Schema(title = "月份区间") private Integer month; @@ -122,6 +123,8 @@ public class TaskUController { @Data static class CusNoteParam { + @Schema(title = "任务id") + private Integer taskId; @NotNull(message = "顾客姓名不能为空") @Schema(title = "顾客姓名") private String customerName; @@ -144,10 +147,9 @@ public class TaskUController { if (useId == null) { return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "未找到该用户"); } - List brandList = param.getBrandList(); customerActionNoteService.save( - new CustomerActionNote().setCustomerName(param.getCustomerName()).setTel(param.getTel()).setArea(param.getArea()) - .setBrandList(brandList).setRemarks(param.getRemarks()).setProvideId(useId).setCreatAt(LocalDateTime.now())); + new CustomerActionNote().setCustomerName(param.getCustomerName()).setTel(param.getTel()).setArea(param.getArea()).setTaskId(param.getTaskId()) + .setBrandList( new CustomUtil().listToString(param.getBrandList())).setRemarks(param.getRemarks()).setProvideId(useId).setCreatAt(LocalDateTime.now())); return Result.success("上传完成"); } @@ -155,7 +157,14 @@ public class TaskUController { @PostMapping("/customerNoteList") @tokenValid public Result customerNote(@Validated @RequestBody JSONObject obj, @RequestHeader(value = "token") @Parameter(name = "登录token") String token) { - return Result.success(customerActionNoteService.pageList(MybatisPlusUtil.SetPage(obj), new JwtUtil().parseOpenid(token))); + IPage iPage = customerActionNoteService.pageList(MybatisPlusUtil.SetPage(obj), new JwtUtil().parseOpenid(token)); + List records = iPage.getRecords(); + for(Map m:records){ + if(m.get("brandList") !=null){ + m.replace("brandList",new CustomUtil().stringToList(m.get("brandList").toString())); + } + } + return Result.success(iPage); } } diff --git a/src/main/java/com/zh/project0512/mapper/CustomerActionNoteMapper.java b/src/main/java/com/zh/project0512/mapper/CustomerActionNoteMapper.java index 670b2de..13ebd7d 100644 --- a/src/main/java/com/zh/project0512/mapper/CustomerActionNoteMapper.java +++ b/src/main/java/com/zh/project0512/mapper/CustomerActionNoteMapper.java @@ -17,8 +17,10 @@ import java.util.Map; */ public interface CustomerActionNoteMapper extends BaseMapper { @Select("") IPage pageList(IPage page,String openid); diff --git a/src/main/java/com/zh/project0512/model/CustomerActionNote.java b/src/main/java/com/zh/project0512/model/CustomerActionNote.java index d2ebb88..232b69e 100644 --- a/src/main/java/com/zh/project0512/model/CustomerActionNote.java +++ b/src/main/java/com/zh/project0512/model/CustomerActionNote.java @@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; -import java.util.List; - import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -50,7 +48,7 @@ public class CustomerActionNote extends Model { @Schema(title = "关联品牌列表") @TableField("brandList") - private List brandList; + private String brandList; /** * 备注 @@ -65,6 +63,10 @@ public class CustomerActionNote extends Model { @TableField("provideId") private Integer provideId; + @Schema(title = "相关任务的id") + @TableField("taskId") + private Integer taskId; + @TableField("creatAt") private LocalDateTime creatAt; diff --git a/src/main/java/com/zh/project0512/utils/CustomUtil.java b/src/main/java/com/zh/project0512/utils/CustomUtil.java index 3e5e4fe..dda3168 100644 --- a/src/main/java/com/zh/project0512/utils/CustomUtil.java +++ b/src/main/java/com/zh/project0512/utils/CustomUtil.java @@ -1,5 +1,6 @@ package com.zh.project0512.utils; +import java.util.Arrays; import java.util.List; public class CustomUtil { @@ -9,18 +10,21 @@ public class CustomUtil { System.out.println("list内容为空！"); } else { for (int i = 0; i <= list.size() - 1; i++) { - if (i == 0) { - sb += ("["); - } - sb += ("'"+ list.get(i).toString() + "'"); +// if (i == 0) { +// sb += ("["); +// } + sb += list.get(i).toString() ; if (i != list.size() - 1) { sb += (","); } - if (i == list.size() - 1) { - sb += ("]"); - } +// if (i == list.size() - 1) { +// sb += ("]"); +// } } } return sb; } + public List stringToList(String stringList){ + return Arrays.asList(stringList.toString().replaceAll("[\\[\\]]", "").split(",")); + } }