*）增加任务表逻辑

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/DateUtils.java

@@ -774,6 +774,34 @@ public class DateUtils {
     }
 
     /**
+     * 获得本天的开始时间，即2012-01-01 00:00:00
+     *
+     * @return
+     */
+    public static Date getCurrentDayStartTime(Date date) {
+        try {
+            date = shortSdf.parse(shortSdf.format(date) + " 00:00:00");
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return date;
+    }
+
+    /**
+     * 获得本天的结束时间，即2012-01-01 23:59:59
+     *
+     * @return
+     */
+    public static Date getCurrentDayEndTime(Date date) {
+        try {
+            date = longSdf.parse(shortSdf.format(date) + " 23:59:59");
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return date;
+    }
+
+    /**
      * 获取指定时间所在周的第一天日期
      *
      * @param date

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/TaskDto.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 任务表
+ *
+ * @author system_generator
+ * @date 2022-05-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="TaskDto", description="任务表")
+public class TaskDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "任务名称")
+    private String name;
+
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+    @ApiModelProperty(value = "状态【0：待填报，1：待签收，2：已完成】")
+    private Integer status = 0;
+
+    @ApiModelProperty(value = "用户ID")
+    private String userId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "对接公司编码")
+    private String appId;
+
+    @ApiModelProperty(value = "单位ID")
+    private String deptId;
+
+    @ApiModelProperty(value = "单位名称")
+    private String deptName;
+
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/Task.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 任务表
+ *
+ * @author system_generator
+ * @date 2022-05-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_task")
+public class Task extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 任务名称
+     */
+	@TableField("name")
+    private String name;
+
+    /**
+     * 内容
+     */
+	@TableField("content")
+    private String content;
+
+    /**
+     * 描述
+     */
+	@TableField("description")
+    private String description;
+
+    /**
+     * 状态【0：待填报，1：待签收，2：已完成】
+     */
+	@TableField("status")
+    private Integer status;
+
+    /**
+     * 用户ID
+     */
+	@TableField("user_id")
+    private String userId;
+
+    /**
+     * 创建时间
+     */
+	@TableField("create_date")
+    private Date createDate;
+
+    /**
+     * 对接公司编码
+     */
+	@TableField("app_id")
+    private String appId;
+
+    /**
+     * 单位ID
+     */
+	@TableField("dept_id")
+    private String deptId;
+
+    /**
+     * 单位名称
+     */
+	@TableField("dept_name")
+    private String deptName;
+
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/enums/TaskStatusEnum.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.enums;
+
+import lombok.Getter;
+
+/**
+ * 任务状态枚举
+ */
+@Getter
+public enum TaskStatusEnum {
+
+    待填报(0, "待填报"),
+    待签收(1, "待签收"),
+    已完成(2, "已完成");
+
+    private Integer key;
+
+    private String desc;
+
+    TaskStatusEnum(Integer key, String desc) {
+        this.key = key;
+        this.desc = desc;
+    }
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/TaskMapper.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.Task;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 任务表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-05-31
+ */
+public interface TaskMapper extends BaseMapper<Task> {
+
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/ITaskService.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 任务表接口类
+ *
+ * @author system_generator
+ * @date 2022-05-31
+ */
+public interface ITaskService {
+
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/TaskMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.tzs.flc.api.mapper.TaskMapper">
+
+</mapper>

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/TaskController.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.tzs.flc.api.enums.TaskStatusEnum;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.TaskServiceImpl;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.TaskDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 任务表
+ *
+ * @author system_generator
+ * @date 2022-05-31
+ */
+@RestController
+@Api(tags = "任务表Api")
+@RequestMapping(value = "/task")
+public class TaskController extends BaseController {
+
+    @Autowired
+    TaskServiceImpl taskServiceImpl;
+
+    /**
+     * 新增任务表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增任务表", notes = "新增任务表")
+    public ResponseModel<TaskDto> save(@RequestBody TaskDto model) {
+        model.setCreateDate(new Date());
+        model.setUserId(RequestContext.getExeUserId());
+        model = taskServiceImpl.createWithModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新任务表", notes = "根据sequenceNbr更新任务表")
+    public ResponseModel<TaskDto> updateBySequenceNbrTask(@RequestBody TaskDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(taskServiceImpl.updateWithModel(model));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除任务表", notes = "根据sequenceNbr删除任务表")
+    public ResponseModel deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        taskServiceImpl.deleteById(sequenceNbr);
+        return ResponseHelper.buildResponse(null);
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个任务表", notes = "根据sequenceNbr查询单个任务表")
+    public ResponseModel<TaskDto> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(taskServiceImpl.queryBySeq(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @param status TODO(uncomplete: 待办，complete：已办)
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "任务表分页查询", notes = "任务表分页查询")
+    public ResponseModel<Page<TaskDto>> queryForPage(@RequestParam(value = "current") int current,
+                                                     @RequestParam(value = "size") int size,
+                                                     @RequestParam(value = "status", required = false) String status) {
+        Page<TaskDto> page = new Page<TaskDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(taskServiceImpl.queryForTaskPageByStatus(page, RequestContext.getExeUserId(), status));
+    }
+
+    /**
+     * 统计任务数量
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "任务数量查询", notes = "任务数量查询")
+    @GetMapping(value = "/queryCount")
+    public ResponseModel<JSONObject> queryCountForMap() {
+        return ResponseHelper.buildResponse(taskServiceImpl.queryCountForMap(RequestContext.getExeUserId()));
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "任务表列表全部数据查询", notes = "任务表列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<TaskDto>> selectForList() {
+        return ResponseHelper.buildResponse(taskServiceImpl.queryForTaskList());
+    }
+}

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/TaskServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.TaskDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.Task;
+import com.yeejoin.amos.boot.module.tzs.flc.api.enums.TaskStatusEnum;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.TaskMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ITaskService;
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 任务表服务实现类
+ *
+ * @author system_generator
+ * @date 2022-05-31
+ */
+@Component
+public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> implements ITaskService {
+
+    public void deleteById(Long sequenceNbr) {
+        TaskDto taskDto = this.queryBySeq(sequenceNbr);
+        taskDto.setIsDelete(true);
+        this.updateWithModel(taskDto);
+    }
+
+    public Page<TaskDto> queryForTaskPageByStatus(Page<TaskDto> page, String userId, String status) {
+        List<Integer> statusList = getStatus(status);
+        return this.queryForTaskPage(page, userId, statusList);
+    }
+
+    public JSONObject queryCountForMap(String userId){
+        Date[] recDate = new Date[2];
+        Date now = DateUtils.getDateNow();
+        recDate[0] = DateUtils.getCurrentDayStartTime(now);
+        recDate[1] = DateUtils.getCurrentDayEndTime(now);
+
+        // 我的任务
+        Integer myTaskCount = this.queryForCount(userId, null, null);
+        // 今日待办
+        List<Integer> statusList = getStatus("uncomplete");
+        Integer todyUnCompletedTaskCount = this.queryForCount(userId, recDate, statusList);
+        // 未完结业务
+        Integer unCompletedTaskCount = this.queryForCount(userId, null, statusList);
+
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("myTask", myTaskCount);
+        jsonObject.put("todyUnCompletedTask", todyUnCompletedTaskCount);
+        jsonObject.put("unCompletedTask", unCompletedTaskCount);
+        return jsonObject;
+    }
+
+    /**
+     * 分页查询
+     */
+    public Page<TaskDto> queryForTaskPage(Page<TaskDto> page, String userId, @Condition(Operator.in) List<Integer> status) {
+        return this.queryForPage(page, null, false, userId, status);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<TaskDto> queryForTaskList() {
+        return this.queryForList("", false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public Integer queryForCount(String userId, @Condition(Operator.between) Date[] recDate, @Condition(Operator.in) List<Integer> status) {
+        return this.queryCount(userId, recDate, status);
+    }
+
+    private List<Integer> getStatus (String status) {
+        List<Integer> statusList = new ArrayList<>();
+        if ("uncomplete".equals(status)) {
+            statusList.add(TaskStatusEnum.待填报.getKey());
+            statusList.add(TaskStatusEnum.待签收.getKey());
+        } else if ("complete".equals(status)) {
+            statusList.add(TaskStatusEnum.已完成.getKey());
+        }
+        return statusList;
+    }
+}
\ No newline at end of file