zh

src/main/java/com/zh/project0512/controller/manage/TaskController.java

@@ -67,6 +67,8 @@ public class TaskController {
     private ITeachingRefeService teachingRefeService;
     @Autowired
     private ITaskTeachRefeService taskTeachRefeService;
+    @Autowired
+    private ITaskDepartmentService taskDepartmentService;
 
     @Operation(summary = "新增")
     @PostMapping("/add")
@@ -89,6 +91,10 @@ public class TaskController {
         if (referenceList != null && referenceList.size() > 0) {
             taskReferenceService.addGroup(referenceList, id);
         }
+        List departmentList = task.getDepartmentList();
+        if (departmentList != null && departmentList.size() > 0) {
+            taskDepartmentService.addGroup(departmentList, id);
+        }
         // 上传任务时同时上传素材
         List<String> referenceUrlList = task.getReferenceUrlList();
         if (referenceUrlList != null && referenceUrlList.size() > 0) {
@@ -320,7 +326,7 @@ public class TaskController {
         if (null != param.getKeyword()) {
             qw.like("t1.title", param.getKeyword());
         }
-        IPage iPage = taskService.idList(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), param.getTagIdList(), param.getBrandIdList(), qw);
+        IPage iPage = taskService.idList(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()),null, param.getTagIdList(), param.getBrandIdList(), qw);
         List list = iPage.getRecords();
         if (list.size() > 0) {
             iPage.setRecords(taskService.list(null, list, param.getTagIdList(), param.getBrandIdList(), qw));

src/main/java/com/zh/project0512/controller/wxApp/TaskUController.java

@@ -91,14 +91,15 @@ public class TaskUController {
     public Result list(@Validated @RequestBody ListTParam param, @RequestHeader String token) {
         QueryWrapper<Reference> qw = new QueryWrapper<>();
         Integer status = param.getStatus();
+        String openid = new JwtUtil().parseOpenid(token);
         qw.ne("t1.status",0);
         if (null != status) {
             qw.eq("t1.status", status == 2 ? 2 : 1);
             if(status == 0){
-                qw.ne("(SELECT count(*)!=0 from userTask as t4,user as t5 WHERE t1.id = t4.taskId and t4.userId = t5.id and t5.openid = +'"+new JwtUtil().parseOpenid(token)+"' )", 1);
+                qw.ne("(SELECT count(*)!=0 from userTask as t4,user as t5 WHERE t1.id = t4.taskId and t4.userId = t5.id and t5.openid = +'"+openid+"' )", 1);
             }
            else if(status == 1){
-                qw.eq("(SELECT count(*)!=0 from userTask as t4,user as t5 WHERE t1.id = t4.taskId and t4.userId = t5.id and t5.openid = +'"+new JwtUtil().parseOpenid(token)+"' )", 1);
+                qw.eq("(SELECT count(*)!=0 from userTask as t4,user as t5 WHERE t1.id = t4.taskId and t4.userId = t5.id and t5.openid = +'"+openid+"' )", 1);
             }
         }
         if (null != param.getMonth()) {
@@ -107,7 +108,7 @@ public class TaskUController {
         if (null != param.getKeyword()) {
             qw.like("t1.title", param.getKeyword());
         }
-        IPage iPage = taskService.idList(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), param.getTagIdList(), param.getBrandIdList(), qw);
+        IPage iPage = taskService.idList(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), openid,param.getTagIdList(), param.getBrandIdList(), qw);
         List list = iPage.getRecords();
         if (list.size() > 0) {
             iPage.setRecords(taskService.list(new JwtUtil().parseOpenid(token), list, param.getTagIdList(), param.getBrandIdList(), qw));

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

@@ -0,0 +1,25 @@
+package com.zh.project0512.mapper;
+
+import com.zh.project0512.model.TaskDepartment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Insert;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zh
+ * @since 2022-06-15
+ */
+public interface TaskDepartmentMapper extends BaseMapper<TaskDepartment> {
+    @Insert("<script> " +
+        "insert into taskDepartment (taskId,departmentId) values\n"+
+        "  <foreach collection= 'list' item= 'item'  separator=','>\n" +
+        "(#{taskId},#{item})\n"+
+        "</foreach> \n"+
+        "</script>")
+    void addGroup(List<Integer> list, int taskId);
+}

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

@@ -38,6 +38,10 @@ public interface TaskMapper extends BaseMapper<Task> {
         ")" +
         "</if>" +
 
+        "<if test='openid!=null'>"+
+        "and t1.id in (SELECT taskId from taskDepartment inner JOIN user on user.openid =#{openid} and user.main_department = taskDepartment.departmentId) "+
+        "</if>"+
+
         "<if test='ew != null'>" +
         "<if test='ew.nonEmptyOfWhere'>" +
         "AND " +
@@ -47,7 +51,7 @@ public interface TaskMapper extends BaseMapper<Task> {
 
         "ORDER BY t1.updateAt DESC,t1.creatAt DESC" +
         "</script>")
-    IPage<Integer> idList(IPage iPage, List<Integer> tagIdList, List<Integer> brandIdList, @Param("ew") Wrapper<Reference> queryWrapper);
+    IPage<Integer> idList(IPage iPage,String openid, List<Integer> tagIdList, List<Integer> brandIdList, @Param("ew") Wrapper<Reference> queryWrapper);
     List<Map> list(String openid,List<Integer> list, List<Integer> tagIdList, List<Integer> brandIdList, @Param("ew") Wrapper<Reference> queryWrapper);
     Task detailById(String openid,int id);
 }

src/main/java/com/zh/project0512/model/TaskDepartment.java

@@ -0,0 +1,42 @@
+package com.zh.project0512.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zh
+ * @since 2022-06-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("taskDepartment")
+public class TaskDepartment extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("taskId")
+    private Integer taskId;
+
+    @TableField("departmentId")
+    private Integer departmentId;
+
+    @TableField("creatAt")
+    private LocalDateTime creatAt;
+
+
+}

src/main/java/com/zh/project0512/service/ITaskDepartmentService.java

@@ -0,0 +1,18 @@
+package com.zh.project0512.service;
+
+import com.zh.project0512.model.TaskDepartment;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zh
+ * @since 2022-06-15
+ */
+public interface ITaskDepartmentService extends IService<TaskDepartment> {
+    void addGroup(List list, int taskId);
+}

src/main/java/com/zh/project0512/service/ITaskService.java

@@ -20,7 +20,7 @@ import java.util.Map;
  */
 public interface ITaskService extends IService<Task> {
     public void add(Task task);
-    IPage<Integer> idList(IPage iPage, List<Integer> tagIdList, List<Integer> brandIdList, @Param("ew") Wrapper<Reference> queryWrapper);
+    IPage<Integer> idList(IPage iPage,String openid, List<Integer> tagIdList, List<Integer> brandIdList, @Param("ew") Wrapper<Reference> queryWrapper);
     List<Map> list(String openid,List<Integer> list, List<Integer> tagIdList, List<Integer> brandIdList, @Param("ew") Wrapper<Reference> queryWrapper);
     Task detailById(String openid,int id);
 }

src/main/java/com/zh/project0512/serviceImpl/TaskDepartmentServiceImpl.java

@@ -0,0 +1,29 @@
+package com.zh.project0512.serviceImpl;
+
+import com.zh.project0512.mapper.TaskReferenceMapper;
+import com.zh.project0512.model.TaskDepartment;
+import com.zh.project0512.mapper.TaskDepartmentMapper;
+import com.zh.project0512.service.ITaskDepartmentService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zh
+ * @since 2022-06-15
+ */
+@Service
+public class TaskDepartmentServiceImpl extends ServiceImpl<TaskDepartmentMapper, TaskDepartment> implements ITaskDepartmentService {
+    @Autowired
+    private TaskDepartmentMapper taskDepartmentMapper;
+    @Override
+    public void addGroup(List list, int taskId) {
+        taskDepartmentMapper.addGroup(list,taskId);
+    }
+}

src/main/java/com/zh/project0512/serviceImpl/TaskServiceImpl.java

@@ -30,8 +30,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
     public void add(Task task) {
         taskMapper.add(task);
     }
-    public IPage<Integer> idList(IPage iPage, List<Integer> tagIdList, List<Integer> brandIdList, @Param("ew") Wrapper<Reference> queryWrapper){
+    public IPage<Integer> idList(IPage iPage,String openid, List<Integer> tagIdList, List<Integer> brandIdList, @Param("ew") Wrapper<Reference> queryWrapper){
-        return taskMapper.idList(iPage,tagIdList,brandIdList,queryWrapper);
+        return taskMapper.idList(iPage,openid,tagIdList,brandIdList,queryWrapper);
     }
     public List<Map> list(String openid,List<Integer> list, List<Integer> tagIdList, List<Integer> brandIdList, @Param("ew") Wrapper<Reference> queryWrapper){
         return taskMapper.list(openid,list,tagIdList,brandIdList,queryWrapper);

src/main/resources/mapper/TaskMapper.xml

@@ -54,6 +54,9 @@
             </foreach>
             )
         </if>
+        <if test='openid!=null'>
+            and t1.id in (SELECT taskId from taskDepartment inner JOIN user on user.openid =#{openid} and user.main_department = taskDepartment.departmentId)
+        </if>
         <if test='ew != null'>
             <if test='ew.nonEmptyOfWhere'>
                 AND