订单合同新增接口

pom.xml

@@ -396,7 +396,7 @@
             </activation>
             <properties>
                 <profiles.active>test</profiles.active>
-                <nacos.server>10.10.10.224:8848</nacos.server>
+                <nacos.server>10.10.10.230:8848</nacos.server>
                 <nacos.namespace>sckw-ng-service-platform</nacos.namespace>
             </properties>
         </profile>

sckw-modules/sckw-contract/src/main/resources/mapper/KwcContractTradeMapper.xml

@@ -44,13 +44,13 @@
           left join kwc_contract_trade_unit e on a.id = e.contract_id and e.unit_type != #{entType} and e.del_flag = 0
           left join kwc_contract_trade f on f.id = a.contract_pid
          where a.del_flag = 0
-           and case when a.status = 3 then a.ent_id = #{entId} and #{entType} = 1
-                else (b.ent_id in
-                        <foreach collection="allEnt" separator="," open="(" close=")" item="item">
-                            #{item}
-                        </foreach>
-                        and b.id is not null)
-                end
+<!--           and case when a.status = 3 then a.ent_id = #{entId} and #{entType} = 1-->
+<!--                else (b.ent_id in-->
+<!--                        <foreach collection="allEnt" separator="," open="(" close=")" item="item">-->
+<!--                            #{item}-->
+<!--                        </foreach>-->
+<!--                        and b.id is not null)-->
+<!--                end-->
         <if test="startTime != null">
             and a.create_time >= #{startTime}
         </if>

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/GoodsInfoReq.java

@@ -2,6 +2,7 @@ package com.sckw.product.model.vo.req;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.io.Serial;
@@ -21,8 +22,8 @@ public class GoodsInfoReq implements Serializable {
      * 企业id
      */
     @Schema(description = "企业id")
-    @NotBlank(message = "企业id不能为空")
-    private Long entId;
+    @NotNull(message = "企业id不能为空")
+    private String entId;
     /**
      * 商品名称
      */

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -1325,7 +1325,7 @@ public class KwpGoodsService {
     public GoodsInfoResp getGoods( GoodsInfoReq req) {
         log.info("查询商品信息，请求参数 :{}", JSON.toJSONString(req));
         //查询上商品信息
-        List<KwpGoods> goods =  kwpGoodsRepository.queryByEntIdAndGoodsName(req.getEntId(), req.getGoodsName());
+        List<KwpGoods> goods =  kwpGoodsRepository.queryByEntIdAndGoodsName(Long.valueOf(req.getEntId()), req.getGoodsName());
         if (org.apache.commons.collections4.CollectionUtils.isEmpty( goods)){
             return new GoodsInfoResp();
         }