追溯查询记录修改

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

@@ -60,7 +60,6 @@ public class TraceRecordController extends BaseController {
 
     //    查询记录搜索
     @ApiOperation(value = "追溯查询记录搜索", response = TraceRecordResponse.class)
-    @AuthRuleAnnotation("udi/trace/record/filter")
     @GetMapping("udi/trace/record/filter")
     public BaseResponse filterLogs(TraceRecordRequest traceRecordRequest) {
 
@@ -118,4 +117,21 @@ public class TraceRecordController extends BaseController {
         }
     }
 
+
+    /**
+     * 获取最近查询记录列表‘
+     */
+    @GetMapping("udi/trace/record/result/list")
+    public BaseResponse getTraceResult(TraceOrderDetailRequest traceOrderDetailRequest) {
+
+        List<TraceOrderResponse> traceOrderResponses = traceOrderService.filterJoin(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/entity/stat/StatCorpInvEntity.java

@@ -55,5 +55,15 @@ public class StatCorpInvEntity implements Serializable {
     @TableField(value = "bussinessName")
     private String bussinessName;
 
+
+    @TableField(value = "qiXieCount")
+    private Integer qiXieCount;
+    @TableField(value = "shiJiCount")
+    private Integer shiJiCount;
+    @TableField(value = "importCount")
+    private Integer importCount;
+    @TableField(value = "unImportCount")
+    private Integer unImportCount;
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -147,4 +147,5 @@ public class TraceRecordResponse {
     private String companyName;
 
 
+    private Integer bussinessStatus;
 }

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

@@ -32,4 +32,7 @@ public class TraceRecordService extends ServiceImpl<TraceRecordMapper, TraceReco
 
 
 
+
+
+
 }

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

@@ -80,7 +80,7 @@
                 and batchNo = #{batchNo}
             </if>
         </where>
-        order by trace_order.billDate
+        order by trace_order.updateTime desc ,trace_order.billDate
     </select>
 
 

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

@@ -3,9 +3,11 @@
 <mapper namespace="com.glxp.api.dao.trace.TraceRecordMapper">
     <select id="filterTraces" parameterType="com.glxp.api.req.trace.TraceRecordRequest"
             resultType="com.glxp.api.res.trace.TraceRecordResponse">
-        SELECT tr.recordCode, tr.remark, tr.createUser, tr.updateTime, trd.*
+        SELECT tr.recordCode, tr.remark, tr.createUser, tr.updateTime, trd.*,
+        uc.companyName,uc.bussinessStatus
         FROM trace_record_log tr
                      LEFT JOIN trace_product_record trd ON trd.id = tr.traceProductIdFk
+        left join user_company uc on trd.companyIdFk = uc.id
         <where>
             <if test="recordCode != '' and recordCode != null">
                 and recordCode = #{recordCode}
@@ -26,5 +28,7 @@
                 and traceSource = #{traceSource}
             </if>
         </where>
+
+        order by tr.updateTime desc
     </select>
 </mapper>