新增历史任务操作

src/main/java/com/glxp/api/controller/trace/TraceTaskController.java

@@ -9,6 +9,7 @@ import com.glxp.api.req.trace.TraceDlTaskRequest;
 import com.glxp.api.req.trace.TraceTaskDetailRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.trace.TraceTaskDlResponse;
+import com.glxp.api.service.trace.TraceTaskHistoryService;
 import com.glxp.api.service.trace.TraceTaskService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,9 +37,12 @@ public class TraceTaskController {
     @Resource
     TraceTaskService traceTaskService;
 
+    @Resource
+    TraceTaskHistoryService traceTaskHistoryService;
+
 
     //任务列表
-    @ApiOperation(value = "查询任务列表",response = TraceTaskDlResponse.class)
+    @ApiOperation(value = "查询任务列表", response = TraceTaskDlResponse.class)
     @AuthRuleAnnotation("udi/trace/task/filter")
     @GetMapping("udi/trace/task/filter")
     public BaseResponse filterTask(TraceTaskDetailRequest traceTaskDetailRequest) {
@@ -53,7 +57,7 @@ public class TraceTaskController {
 
 
     //客户端下载追溯任务列表执行下载任务
-    @ApiOperation(value = "客户端下载追溯任务列表执行下载任务",response = TraceTaskDlResponse.class)
+    @ApiOperation(value = "客户端下载追溯任务列表执行下载任务", response = TraceTaskDlResponse.class)
     @AuthRuleAnnotation("udi/trace/task/search")
     @GetMapping("udi/trace/task/search")
     public BaseResponse downloadTask(TraceDlTaskRequest taskRequest) {
@@ -68,4 +72,17 @@ public class TraceTaskController {
     }
 
 
+    //任务列表
+    @ApiOperation(value = "查询历史人物", response = TraceTaskDlResponse.class)
+    @AuthRuleAnnotation("udi/trace/task/history/filter")
+    @GetMapping("udi/trace/task/history/filter")
+    public BaseResponse filterhistoryTask(TraceTaskDetailRequest traceTaskDetailRequest) {
+
+        List<TraceTaskDlResponse> traceTaskDlResponses = traceTaskHistoryService.queryTraceTaskList(traceTaskDetailRequest);
+        PageInfo<TraceTaskDlResponse> pageInfo = new PageInfo<>(traceTaskDlResponses);
+        PageSimpleResponse<TraceTaskDlResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(traceTaskDlResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
 }

src/main/java/com/glxp/api/dao/trace/TraceTaskHistoryMapper.java

@@ -0,0 +1,16 @@
+package com.glxp.api.dao.trace;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.trace.TraceTaskHistoryEntity;
+import com.glxp.api.req.trace.TraceTaskDetailRequest;
+import com.glxp.api.res.trace.TraceTaskDlResponse;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface TraceTaskHistoryMapper extends BaseMapper<TraceTaskHistoryEntity> {
+
+
+    List<TraceTaskDlResponse> queryTraceTaskList(TraceTaskDetailRequest traceTaskDetailRequest);
+}

src/main/java/com/glxp/api/entity/trace/TraceTaskHistoryEntity.java

@@ -0,0 +1,118 @@
+package com.glxp.api.entity.trace;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+    * 任务公告历史表
+    */
+@Data
+@TableName(value = "trace_task_history")
+public class TraceTaskHistoryEntity implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    /**
+     * 查询记录表ID外键
+     */
+    @TableField(value = "produdctRecordIdFk")
+    private Long produdctRecordIdFk;
+
+    /**
+     * 任务类型1：关联关系；2：入库；3：出库
+     */
+    @TableField(value = "taskType")
+    private Byte taskType;
+
+    /**
+     * 任务状态（未处理/正在处理（任务被下载）/
+已处理（任务已提交）
+     */
+    @TableField(value = "`status`")
+    private Byte status;
+
+    /**
+     * 企业信息ID外键
+     */
+    @TableField(value = "companyIdFk")
+    private Long companyIdFk;
+
+    /**
+     * 医疗器械注册人
+     */
+    @TableField(value = "ylqxzcrbarmc")
+    private String ylqxzcrbarmc;
+
+    /**
+     * 医疗器械注册人统一社会信用号
+     */
+    @TableField(value = "creditNum")
+    private String creditNum;
+
+    /**
+     * 产品名称
+     */
+    @TableField(value = "cpmctymc")
+    private String cpmctymc;
+
+    /**
+     * 规格型号
+     */
+    @TableField(value = "ggxh")
+    private String ggxh;
+
+    /**
+     * 批次号
+     */
+    @TableField(value = "batchNo")
+    private String batchNo;
+
+    /**
+     * 生产日期
+     */
+    @TableField(value = "produceDate")
+    private String produceDate;
+
+    /**
+     * 失效日期
+     */
+    @TableField(value = "expireDate")
+    private String expireDate;
+
+    /**
+     * 序列号
+     */
+    @TableField(value = "serialNo")
+    private String serialNo;
+
+    /**
+     * 查询UDI码
+     */
+    @TableField(value = "udiCode")
+    private String udiCode;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    private Date updateTime;
+
+    /**
+     * DI标识数组，逗号隔开
+     */
+    @TableField(value = "diList")
+    private String diList;
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/glxp/api/service/trace/TraceTaskHistoryService.java

@@ -0,0 +1,31 @@
+package com.glxp.api.service.trace;
+
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.dao.trace.TraceTaskNoticeMapper;
+import com.glxp.api.req.trace.TraceTaskDetailRequest;
+import com.glxp.api.res.trace.TraceTaskDlResponse;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.dao.trace.TraceTaskHistoryMapper;
+import com.glxp.api.entity.trace.TraceTaskHistoryEntity;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class TraceTaskHistoryService extends ServiceImpl<TraceTaskHistoryMapper, TraceTaskHistoryEntity> {
+    @Resource
+    TraceTaskHistoryMapper traceTaskHistoryMapper;
+
+    public List<TraceTaskDlResponse> queryTraceTaskList(TraceTaskDetailRequest traceTaskDetailRequest) {
+        if (traceTaskDetailRequest == null) {
+            return Collections.emptyList();
+        }
+        if (traceTaskDetailRequest.getPage() != null) {
+            int offset = (traceTaskDetailRequest.getPage() - 1) * traceTaskDetailRequest.getLimit();
+            PageHelper.offsetPage(offset, traceTaskDetailRequest.getLimit());
+        }
+        return traceTaskHistoryMapper.queryTraceTaskList(traceTaskDetailRequest);
+    }
+}

src/main/resources/mybatis/mapper/trace/TraceTaskHistoryMapper.xml

@@ -0,0 +1,29 @@
+<?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.glxp.api.dao.trace.TraceTaskHistoryMapper">
+    <select id="queryTraceTaskList" parameterType="com.glxp.api.req.trace.TraceTaskDetailRequest"
+            resultType="com.glxp.api.res.trace.TraceTaskDlResponse">
+        SELECT *
+        FROM trace_task_history
+        <where>
+            <if test="taskType != '' and taskType != null">
+                and taskType = #{taskType}
+            </if>
+            <if test="status != '' and status != null">
+                and status = #{status}
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                and cpmctymc LIKE CONCAT('%', #{cpmctymc}, '%')
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                and ggxh LIKE CONCAT('%', #{ggxh}, '%')
+            </if>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                and ylqxzcrbarmc = #{ylqxzcrbarmc}
+            </if>
+            <if test="batchNo != '' and batchNo != null">
+                and batchNo = #{batchNo}
+            </if>
+        </where>
+    </select>
+</mapper>

src/main/resources/mybatis/mapper/trace/TraceTaskNoticeMapper.xml

@@ -25,11 +25,6 @@
             <if test="batchNo != '' and batchNo != null">
                 and batchNo = #{batchNo}
             </if>
-
         </where>
-
-
-
-
     </select>
 </mapper>