|
|
@@ -1,6 +1,7 @@
|
|
|
package com.jzg.quotation.summary.controller;
|
|
|
|
|
|
|
|
|
+import cn.hutool.json.JSONUtil;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
@@ -28,6 +29,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
|
|
import jakarta.annotation.Resource;
|
|
|
import jakarta.servlet.http.HttpServletRequest;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
+import org.slf4j.Logger;
|
|
|
+import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
@@ -45,6 +48,8 @@ import java.util.stream.Collectors;
|
|
|
@RequiredArgsConstructor
|
|
|
public class InsOrdersController extends BaseController {
|
|
|
|
|
|
+ private static final Logger log = LoggerFactory.getLogger(InsOrdersController.class);
|
|
|
+
|
|
|
@Resource
|
|
|
private InsOrdersService insOrdersService;
|
|
|
|
|
|
@@ -94,6 +99,7 @@ public class InsOrdersController extends BaseController {
|
|
|
@PostMapping("queryList")
|
|
|
@Operation(summary = "查询订单列表")
|
|
|
public HttpResult queryList(@RequestBody InsOrdersParamVO insOrdersParam) {
|
|
|
+ log.info("查询订单列表,insOrdersParam=[{}]", JSONUtil.toJsonStr(insOrdersParam));
|
|
|
String systemCode = "";
|
|
|
//如果是APP登录的话 则传递SystemCode的头部字段
|
|
|
if (baseController.getUserSystemCode().equals("APP")) {
|
|
|
@@ -185,7 +191,7 @@ public class InsOrdersController extends BaseController {
|
|
|
.flatMap(List::stream)
|
|
|
.map(KindInfoVo::getKindCode)
|
|
|
.distinct() // 去重
|
|
|
- .collect(Collectors.toList());
|
|
|
+ .toList();
|
|
|
|
|
|
|
|
|
|
|
|
@@ -194,7 +200,7 @@ public class InsOrdersController extends BaseController {
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
jsonObject.put("companyName",item.getCompanyName());
|
|
|
for (String kingCode : kindList) {
|
|
|
- List<KindInfoVo> collect = item.getKindInfoVo().stream().filter(x -> x.getKindCode().equals(kingCode)).collect(Collectors.toList());
|
|
|
+ List<KindInfoVo> collect = item.getKindInfoVo().stream().filter(x -> x.getKindCode().equals(kingCode)).toList();
|
|
|
if(collect.isEmpty()){
|
|
|
jsonObject.put(kingCode,"-");
|
|
|
}else{
|