zh

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;

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<String> 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<Map> iPage = customerActionNoteService.pageList(MybatisPlusUtil.SetPage(obj), new JwtUtil().parseOpenid(token));
+        List<Map> 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);
     }
 }
 

src/main/java/com/zh/project0512/mapper/CustomerActionNoteMapper.java

@@ -17,8 +17,10 @@ import java.util.Map;
  */
 public interface CustomerActionNoteMapper extends BaseMapper<CustomerActionNote> {
     @Select("<script> " +
-        "select t1.*,t2.name as provideName\n" +
-        " from customerActionNote as t1,user as t2 WHERE t1.provideId = t2.id"+
+        "select t1.*,t2.name as provideName,t3.title as taskTitle\n" +
+        "from customerActionNote as t1\n" +
+        "LEFT JOIN user as t2 on t1.provideId = t2.id\n" +
+        "LEFT JOIN task as t3 on t1.taskId = t3.id\n"+
         "<if test='openid!=null'>and t2.openid =#{openid} </if>"+
         "</script>")
     IPage<Map> pageList(IPage page,String openid);

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<String> 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;
 

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(","));
+    }
 }