合同关联订单列表接口

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/UpdateOrderParam.java

@@ -6,6 +6,7 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -28,8 +29,7 @@ public class UpdateOrderParam {
      * 操作类型0保存、1提交
      */
     @NotNull(message = "操作类型不能为空")
-    @Min(value = 0,message = "非法操作状态")
-    @Max(value = 1,message = "非法操作状态")
+    @Range(min = 1, max = 2, message = "非法订单类型")
     private Integer operateType;
 
     /**

sckw-modules/sckw-report/src/main/java/com/sckw/report/controller/KwOrderController.java

@@ -86,8 +86,19 @@ public class KwOrderController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @PostMapping(value = "/tradeOrderStatementList", produces = MediaType.APPLICATION_JSON_VALUE)
-    public HttpResult select(@RequestBody @Validated TradeOrderStatementList params) {
+    public HttpResult tradeOrderStatementList(@RequestBody @Validated TradeOrderStatementList params) {
         return HttpResult.ok(orderService.tradeOrderStatementList(params));
     }
 
+    /**
+     * @desc: 合同关联订单列表
+     * @author: yzc
+     * @date: 2023-07-27 16:48
+     * @Param params:
+     * @return: com.sckw.core.web.response.HttpResult
+     */
+    @PostMapping(value = "/tradeOrderContractList", produces = MediaType.APPLICATION_JSON_VALUE)
+    public HttpResult tradeOrderContractList(@RequestBody @Validated TradeOrderContractParam params) {
+        return HttpResult.ok(orderService.tradeOrderContractList(params));
+    }
 }

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwOrderService.java

@@ -316,4 +316,28 @@ public class KwOrderService {
         query.addCriteria(criteria);
         return getResult(query, params.getPage(), params.getPageSize());
     }
+
+    /**
+     * @desc: 合同关联订单列表
+     * @author: yzc
+     * @date: 2023-07-27 17:05
+     * @Param params:
+     * @return: com.sckw.core.model.page.PageResult
+     */
+    public PageResult tradeOrderContractList(TradeOrderContractParam params) {
+        Long entId = LoginUserHolder.getEntId();
+        Query query = new Query();
+        Criteria criteria = new Criteria();
+        if (Objects.equals(params.getOrderType(), 1)) {
+            //采购订单
+            criteria.and("procureTopEntId").is(entId);
+        } else {
+            //销售订单
+            criteria.and("supplyTopEntId").is(entId);
+        }
+        List<Long> ids = StringUtils.splitStrToList(params.getContractIds(), ",", Long.class);
+        criteria.and("contractId").in(ids).and("delFlag").is(0);
+        query.addCriteria(criteria);
+        return getResult(query, params.getPage(), params.getPageSize());
+    }
 }

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/param/TradeOrderContractParam.java

@@ -0,0 +1,28 @@
+package com.sckw.report.service.param;
+
+import com.sckw.core.model.page.PageRequest;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.hibernate.validator.constraints.Range;
+
+/**
+ * @desc: 合同关联订单列表请求参数
+ * @author: yzc
+ * @date: 2023-07-27 16:48
+ */
+@Getter
+@Setter
+@ToString
+public class TradeOrderContractParam extends PageRequest {
+
+    @NotBlank(message = "合同ids不能为空")
+    private String contractIds;
+
+    @Range(min = 1, max = 2, message = "非法订单类型")
+    @NotNull(message = "订单类型不能为空")
+    private Integer orderType;
+
+}

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/param/TradeOrderListStatisticParam.java

@@ -1,12 +1,11 @@
 package com.sckw.report.service.param;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import org.hibernate.validator.constraints.Range;
 
 import java.util.Date;
 
@@ -23,8 +22,7 @@ public class TradeOrderListStatisticParam {
     /**
      * 订单类型（2销售订单、1采购订单）
      */
-    @Min(value = 1, message = "非法订单类型")
-    @Max(value = 2, message = "非法订单类型")
+    @Range(min = 1, max = 2, message = "非法订单类型")
     @NotNull(message = "订单类型不能为空")
     private Integer orderType;
     /**

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/param/TradeOrderStatementList.java

@@ -2,12 +2,11 @@ package com.sckw.report.service.param;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sckw.core.model.page.PageRequest;
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import org.hibernate.validator.constraints.Range;
 
 import java.time.LocalDate;
 
@@ -24,8 +23,7 @@ public class TradeOrderStatementList extends PageRequest {
     /**
      * 订单类型（1采购订单2销售订单）
      */
-    @Min(value = 1, message = "非法订单类型")
-    @Max(value = 2, message = "非法订单类型")
+    @Range(min = 1, max = 2, message = "非法订单类型")
     @NotNull(message = "订单类型不能为空")
     private Integer orderType;