求购列表查询优化

sckw-common/sckw-common-core/src/main/java/com/sckw/core/aspect/LogAspect.java

@@ -12,6 +12,7 @@ import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -34,7 +35,7 @@ public class LogAspect {
     public void loggerPointcut(Log l) {
     }
 
-    @Around("loggerPointcut(l)")
+    @Around(value = "loggerPointcut(l)", argNames = "p,l")
     public Object around(ProceedingJoinPoint p, Log l) throws Throwable {
         Object result = null;
         //开始时间
@@ -44,7 +45,7 @@ public class LogAspect {
         Object[] args = p.getArgs();
         Stream<?> stream = ArrayUtils.isEmpty(args) ? Stream.empty() : Arrays.stream(args);
         List<Object> logArgs = stream
-                .filter(arg -> (!(arg instanceof HttpServletRequest) && !(arg instanceof HttpServletResponse)))
+                .filter(arg -> (!(arg instanceof HttpServletRequest) && !(arg instanceof HttpServletResponse)) && !(arg instanceof MultipartFile))
                 .collect(Collectors.toList());
         //过滤后序列化无异常
         String param = JSON.toJSONString(logArgs);

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -89,7 +89,7 @@ public class KwoTradeOrderService {
     private final KwoTradeOrderContractService kwoTradeOrderContractService;
     private final KwoTradeOrderTrackService kwoTradeOrderTrackService;
 
-    private static final String ORDER_NO_PREFIX = "CD";
+    private static final String ORDER_NO_PREFIX = "B";
 
     /**
      * @desc: 采购下单草稿

sckw-modules/sckw-order/src/main/resources/mapper/KwoWantBuyMapper.xml

@@ -36,14 +36,14 @@
         <result column="remark" property="remark"/>
         <result column="createTime" property="createTime"/>
         <result column="updateTime" property="updateTime"/>
-        <collection property="wantBuyTradings" column="id" ofType="com.sckw.order.model.vo.res.WantBuyTradingRes" javaType="java.util.List" select="tradingSql" >
+        <collection property="wantBuyTradings" column="id" ofType="com.sckw.order.model.vo.res.WantBuyTradingRes"  javaType="java.util.List" >
             <id column="wantBuyId" property="wantBuyId"/>
             <result column="trading" property="trading"/>
         </collection>
     </resultMap>
 
     <sql id="where">
-        kb.del_flag = 0 and kt.del_flag = 0
+        kb.del_flag = 0
         <if test="wantBuyReq.startCreateTime != null">
             and kb.create_time &gt;= #{wantBuyReq.startCreateTime,jdbcType=TIMESTAMP}
         </if>