问题处理

hx-sale/src/main/java/com/fjhx/sale/entity/contract/dto/ContractSelectDto.java

@@ -63,4 +63,9 @@ public class ContractSelectDto extends BaseSelectDto {
      * 跟单搜索条件----0:默认 1：无记录 2：有记录
      */
     private Integer documentarySearch;
+
+    /**
+     * 合同编号
+     */
+    private String contractCode;
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -424,6 +424,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         if (StringUtils.isNotEmpty(dto.getUserId())) {
             wrapper.eq("t1", Contract::getCreateUser, dto.getUserId());
         }
+        if (StringUtils.isNotEmpty(dto.getContractCode())) {
+            wrapper.like("t1", Contract::getCode, dto.getContractCode());
+        }
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.keyword(dto.getKeyword(), new SqlField("t1.code"));
         }
@@ -458,6 +461,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         if (StringUtils.isNotEmpty(dto.getUserId())) {
             wrapper.eq("t1", Contract::getCreateUser, dto.getUserId());
         }
+        if (StringUtils.isNotEmpty(dto.getContractCode())) {
+            wrapper.like("t1", Contract::getCode, dto.getContractCode());
+        }
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.keyword(dto.getKeyword(), new SqlField("t1.code"));
         }
@@ -694,6 +700,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         if (StringUtils.isNotEmpty(dto.getUserId())) {
             wrapper.eq("t1", Contract::getCreateUser, dto.getUserId());
         }
+        if (StringUtils.isNotEmpty(dto.getContractCode())) {
+            wrapper.like("t1", Contract::getCode, dto.getContractCode());
+        }
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.keyword(dto.getKeyword(), new SqlField("t1.code"));
         }

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -93,16 +93,17 @@
 
     <select id="getNoPackContractByCustomerId" resultType="com.fjhx.sale.entity.contract.vo.ContractVo">
         SELECT
-            *
+        *
         FROM
-            (
-                SELECT
-                    t1.*,
-                    t2.quantity AS cpQuantity,
-                    ( SELECT IFNULL( SUM( quantity ), 0 ) FROM pack_detail_product WHERE contract_product_id = t2.id ) AS sumPackQuantity
-                FROM
-                    contract t1
-                LEFT JOIN contract_product t2 ON t1.id = t2.contract_id
+        (
+        SELECT
+        t1.*,
+        t2.quantity AS cpQuantity,
+        ( SELECT IFNULL( SUM( pd.pack_quantity * pdd.quantity ), 0 ) FROM pack_detail_product pdd LEFT JOIN pack_detail
+        pd ON pdd.pack_detail_id = pd.id WHERE pdd.contract_product_id = t2.id ) AS sumPackQuantity
+        FROM
+        contract t1
+        LEFT JOIN contract_product t2 ON t1.id = t2.contract_id
         <where>
             <if test="customerId neq null and customerId neq '' ">
                 buy_corporation_id = #{customerId}