UDI查询模块代码提交

pom.xml

@@ -371,6 +371,15 @@
                 <artifactId>bcprov-jdk15to18</artifactId>
                 <version>1.68</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-amqp</artifactId>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-web</artifactId>
+            </dependency>
         </dependencies>
 
     <build>

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

@@ -0,0 +1,41 @@
+package com.glxp.api.controller.trace;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.req.trace.TraceOrderDetailRequest;
+import com.glxp.api.req.trace.TraceOrderRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.trace.TraceOrderResponse;
+import com.glxp.api.res.trace.TraceRecordResponse;
+import com.glxp.api.service.trace.TraceOrderService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@ApiIgnore
+@RestController
+@Slf4j
+public class TraceOrderController extends BaseController {
+
+    @Resource
+    TraceOrderService traceOrderService;
+
+    @AuthRuleAnnotation("")
+    @GetMapping("udi/trace/order/filter")
+    public BaseResponse getTraceOrderList(TraceOrderDetailRequest traceOrderDetailRequest) {
+        List<TraceOrderResponse> traceOrderResponses = traceOrderService.queryTraceOrderList(traceOrderDetailRequest);
+        PageInfo<TraceOrderResponse> pageInfo = new PageInfo<>(traceOrderResponses);
+        PageSimpleResponse<TraceOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(traceOrderResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+}

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

@@ -2,8 +2,15 @@ package com.glxp.api.dao.trace;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.trace.TraceOrderEntity;
+import com.glxp.api.req.trace.TraceOrderDetailRequest;
+import com.glxp.api.req.trace.TraceOrderRequest;
+import com.glxp.api.res.trace.TraceOrderResponse;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface TraceOrderMapper extends BaseMapper<TraceOrderEntity> {
+
+    List<TraceOrderResponse> queryTraceOrderList(TraceOrderDetailRequest traceOrderDetailRequest);
 }

src/main/java/com/glxp/api/req/trace/TraceOrderDetailRequest.java

@@ -0,0 +1,16 @@
+package com.glxp.api.req.trace;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class TraceOrderDetailRequest extends ListPageRequest {
+
+    private String udiCode;
+    private String ylqxzcrbarmc;
+    private String cpmctymc;
+    private String ggxh;
+    private String nameCode;
+    private String batchNo;
+    private String companyName;
+}

src/main/java/com/glxp/api/req/trace/TraceOrderRequest.java

@@ -0,0 +1,112 @@
+package com.glxp.api.req.trace;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class TraceOrderRequest extends ListPageRequest {
+
+    private Long id;
+
+    /**
+     * 单据号
+     */
+    private String billNo;
+
+    /**
+     * 单据时间
+     */
+    private String billDate;
+
+    /**
+     * 1:入库；2：出库
+     */
+    private Byte inOutType;
+
+    /**
+     * 单据类型
+     */
+    private String billType;
+
+    /**
+     * 发货企业
+     */
+    private String fromCorp;
+
+    /**
+     * 发货企业统一社会信用号
+     */
+    private String fromCorpCreditNum;
+
+    /**
+     * 收货企业
+     */
+    private String toCorp;
+
+    /**
+     * 收货企业统一社会信用号
+     */
+    private String toCorpCreditNum;
+
+    /**
+     * 单据创建者
+     */
+    private Long createUser;
+
+    /**
+     * 企业信息ID外键
+     */
+    private Long companyIdFk;
+
+    /**
+     * 客户端类型
+     */
+    private Byte clientType;
+
+    /**
+     * 退货原因（退货时填写）
+     */
+    private String returnReason;
+
+    /**
+     * 销毁原因（销毁时填写）
+     */
+    private String destoryReason;
+
+    /**
+     * 执行销毁人（销毁时填写）
+     */
+    private String excuseUser;
+
+    /**
+     * 执行销毁人证件号（销毁时填写）
+     */
+    private String excuseCode;
+
+    /**
+     * 监督人姓名【销毁出库时填写】
+     */
+    private String superviserUser;
+
+    /**
+     * 监督人证件号【销毁出库时填写】
+     */
+    private String superviserCode;
+
+    /**
+     * 上传着ID
+     */
+    private Long uploadUser;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+}

src/main/java/com/glxp/api/res/trace/TraceOrderResponse.java

@@ -0,0 +1,115 @@
+package com.glxp.api.res.trace;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class TraceOrderResponse {
+    private Long id;
+
+    /**
+     * 单据号
+     */
+    private String billNo;
+
+    /**
+     * 单据时间
+     */
+    private String billDate;
+
+    /**
+     * 1:入库；2：出库
+     */
+    private Byte inOutType;
+
+    /**
+     * 单据类型
+     */
+    private String billType;
+
+    /**
+     * 发货企业
+     */
+    private String fromCorp;
+
+    /**
+     * 发货企业统一社会信用号
+     */
+    private String fromCorpCreditNum;
+
+    /**
+     * 收货企业
+     */
+    private String toCorp;
+
+    /**
+     * 收货企业统一社会信用号
+     */
+    private String toCorpCreditNum;
+
+    /**
+     * 单据创建者
+     */
+    private Long createUser;
+
+    /**
+     * 企业信息ID外键
+     */
+    private Long companyIdFk;
+
+    /**
+     * 企业名称
+     */
+    private String companyName;
+
+    /**
+     * 客户端类型
+     */
+    private Byte clientType;
+
+    /**
+     * 退货原因（退货时填写）
+     */
+    private String returnReason;
+
+    /**
+     * 销毁原因（销毁时填写）
+     */
+    private String destoryReason;
+
+    /**
+     * 执行销毁人（销毁时填写）
+     */
+    private String excuseUser;
+
+    /**
+     * 执行销毁人证件号（销毁时填写）
+     */
+    private String excuseCode;
+
+    /**
+     * 监督人姓名【销毁出库时填写】
+     */
+    private String superviserUser;
+
+    /**
+     * 监督人证件号【销毁出库时填写】
+     */
+    private String superviserCode;
+
+    /**
+     * 上传着ID
+     */
+    private Long uploadUser;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+}

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

@@ -2,7 +2,15 @@ package com.glxp.api.service.trace;
 
 import com.glxp.api.entity.trace.TraceOrderEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.glxp.api.req.trace.TraceOrderDetailRequest;
+import com.glxp.api.req.trace.TraceOrderRequest;
+import com.glxp.api.res.trace.TraceOrderResponse;
+
+import java.util.List;
+
 public interface TraceOrderService extends IService<TraceOrderEntity>{
 
+    List<TraceOrderResponse> queryTraceOrderList(TraceOrderDetailRequest traceOrderDetailRequest);
+
 
 }

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

@@ -1,11 +1,33 @@
 package com.glxp.api.service.trace;
 
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.req.trace.TraceOrderDetailRequest;
+import com.glxp.api.req.trace.TraceOrderRequest;
+import com.glxp.api.res.trace.TraceOrderResponse;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.dao.trace.TraceOrderMapper;
 import com.glxp.api.entity.trace.TraceOrderEntity;
 
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
 @Service
 public class TraceOrderServiceImpl extends ServiceImpl<TraceOrderMapper, TraceOrderEntity> implements TraceOrderService{
 
+    @Resource
+    TraceOrderMapper traceOrderMapper;
+
+    @Override
+    public List<TraceOrderResponse> queryTraceOrderList(TraceOrderDetailRequest traceOrderDetailRequest) {
+        if (traceOrderDetailRequest == null) {
+            return Collections.emptyList();
+        }
+        if (traceOrderDetailRequest.getPage() != null) {
+            int offset = (traceOrderDetailRequest.getPage() - 1) * traceOrderDetailRequest.getLimit();
+            PageHelper.offsetPage(offset, traceOrderDetailRequest.getLimit());
+        }
+        return traceOrderMapper.queryTraceOrderList(traceOrderDetailRequest);
+    }
 }

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

@@ -1,4 +1,39 @@
 <?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.TraceOrderMapper">
+    <select id="queryTraceOrderList" parameterType="com.glxp.api.req.trace.TraceOrderDetailRequest"
+            resultType="com.glxp.api.res.trace.TraceOrderResponse">
+        SELECT tor.*,uc.companyName
+        FROM trace_order tor
+        LEFT JOIN user_company uc ON uc.id = tor.companyIdFk
+        LEFT JOIN (SELECT tr.recordCode,trd.*
+        FROM trace_record tr
+        LEFT JOIN trace_record_detail trd ON trd.recordIdFk = tr.id) trmid ON trmid.recordCode = tor.recordCodeFk
+        <where>
+            <if test="id != '' and id != null">
+                and id = #{id}
+            </if>
+            <if test="udiCode != '' and udiCode != null">
+                and udiCode = #{udiCode}
+            </if>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                and ylqxzcrbarmc = #{ylqxzcrbarmc}
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                and cpmctymc = #{cpmctymc}
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                and ggxh = #{ggxh}
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                and nameCode = #{nameCode}
+            </if>
+            <if test="batchNo != '' and batchNo != null">
+                and batchNo = #{batchNo}
+            </if>
+            <if test="companyName != null and '' != companyName">
+                AND companyName LIKE CONCAT('%', #{companyName}, '%')
+            </if>
+        </where>
+    </select>
 </mapper>