提交新增合同文件校验

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/dao/KwcContractTradeMapper.java

@@ -29,6 +29,7 @@ public interface KwcContractTradeMapper extends BaseMapper<KwcContractTrade> {
      * @return QueryListResVo
      */
     List<QueryListResDto> queryList(QueryListReqDto reqVo);
+    List<QueryListResDto> queryList1(QueryListReqDto reqVo);
 
     /**
      * @param entIdList  企业id

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -178,7 +178,7 @@ public class KwcContractTradeService {
             }
         }
 
-        List<QueryListResDto> queryListResDtos = kwcContractTradeMapper.queryList(queryListReqDto);
+        List<QueryListResDto> queryListResDtos = kwcContractTradeMapper.queryList1(queryListReqDto);
         if (CollectionUtils.isEmpty(queryListResDtos)) {
             return PageHelperUtil.getPageResult(new PageInfo<>());
         }

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

@@ -9,21 +9,21 @@
                a.trading,
                a.name contractName,
                a.contract_no,
-               c.create_by initiateBy,
-               c.create_time initiateTime,
+               a.create_by initiateBy,
+               a.create_time initiateTime,
                a.create_time,
                a.start_time,
                a.end_time,
                a.id,
                a.remark,
                a.signing_way,
-               d.create_time signTime,
+               a.create_time signTime,
                a.status,
                b.unit_type,
                b.ent_id,
                b.firm_name entName,
-               e.ent_id targetEntId,
-               e.firm_name targetEntName,
+               b.ent_id targetEntId,
+               b.firm_name targetEntName,
                a.contract_pid contractPid,
                a.performed_amount performedAmount,
                f.name contractPname,
@@ -32,17 +32,17 @@
           from kwc_contract_trade a
           left join kwc_contract_trade_unit b
             on a.id = b.contract_id
-           and b.unit_type = #{entType}
-           and case when a.status != 3 then b.ent_id in
-                <foreach collection="allEnt" separator="," open="(" close=")" item="item">
-                    #{item}
-                </foreach>
-               else 1=1
-                end
+<!--           and b.unit_type = #{entType}-->
+<!--           and case when a.status != 3 then b.ent_id in-->
+<!--                <foreach collection="allEnt" separator="," open="(" close=")" item="item">-->
+<!--                    #{item}-->
+<!--                </foreach>-->
+<!--               else 1=1-->
+<!--                end-->
            and b.del_flag = 0
-          left join kwc_contract_trade_track c on a.id = c.contract_id and c.del_flag = 0 and c.type = 1
-          left join kwc_contract_trade_track d on a.id = d.contract_id and d.del_flag = 0 and d.type = 0
-          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_track c on a.id = c.contract_id and c.del_flag = 0 -->
+<!--          left join kwc_contract_trade_track d on a.id = d.contract_id and d.del_flag = 0 -->
+<!--          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-->
@@ -61,26 +61,26 @@
         <if test="status != null">
             and a.status = #{status}
         </if>
-        <if test="keywords != null and keywords != ''">
-            and (b.firm_name like concat('%', #{keywords}, '%') or
-                 e.firm_name like concat('%', #{keywords}, '%') or
-                 b.phone like concat('%', #{keywords}, '%') or
-                 b.sign_phone like concat('%', #{keywords}, '%') or
-                 a.contract_no like concat('%', #{keywords}, '%') or
-                 a.name like concat('%', #{keywords}, '%')
-                 <if test="initiateList != null and initiateList.size() > 0">
-                     or a.create_by in
-                     <foreach collection="initiateList" item="item" open="(" close=")" separator=",">
-                         #{item}
-                     </foreach>
-                 </if> )
-        </if>
-        <if test="idList != null and idList.size() > 0">
-            and a.id in
-            <foreach collection="idList" open="(" close=")" separator="," item="item">
-                #{item}
-            </foreach>
-        </if>
+<!--        <if test="keywords != null and keywords != ''">-->
+<!--            and (b.firm_name like concat('%', #{keywords}, '%') or-->
+<!--                 e.firm_name like concat('%', #{keywords}, '%') or-->
+<!--                 b.phone like concat('%', #{keywords}, '%') or-->
+<!--                 b.sign_phone like concat('%', #{keywords}, '%') or-->
+<!--                 a.contract_no like concat('%', #{keywords}, '%') or-->
+<!--                 a.name like concat('%', #{keywords}, '%')-->
+<!--                 <if test="initiateList != null and initiateList.size() > 0">-->
+<!--                     or a.create_by in-->
+<!--                     <foreach collection="initiateList" item="item" open="(" close=")" separator=",">-->
+<!--                         #{item}-->
+<!--                     </foreach>-->
+<!--                 </if> )-->
+<!--        </if>-->
+<!--        <if test="idList != null and idList.size() > 0">-->
+<!--            and a.id in-->
+<!--            <foreach collection="idList" open="(" close=")" separator="," item="item">-->
+<!--                #{item}-->
+<!--            </foreach>-->
+<!--        </if>-->
         <if test="trading != null">
             and a.trading = #{trading}
         </if>
@@ -88,25 +88,25 @@
             and a.signing_way = #{signingWay}
         </if>
         <if test="targetEntId != null">
-            and e.ent_id = #{targetEntId}
+            and b.ent_id = #{targetEntId}
         </if>
         <if test="contractCode != null  and '' != contractCode">
-            and f.contract_no like concat('%',#{contractCode},'%')
+            and a.contract_no like concat('%',#{contractCode},'%')
         </if>
         <if test="contractName != null  and '' != contractName">
-            and f.name  like concat('%',#{contractName},'%')
+            and a.name  like concat('%',#{contractName},'%')
         </if>
         <if test="supplementCode != null  and '' != supplementCode">
             and f.contract_pid != null
             and f.contract_no  like concat('%',#{supplementCode},'%')
         </if>
         <if test="purchaseEntId != null  and '' != purchaseEntId">
-            and e.unit_type = 2
-            and e.id  = #{purchaseEntId}
+            and b.unit_type = 2
+            and b.id  = #{purchaseEntId}
         </if>
         <if test="supplyEntId != null  and '' != supplyEntId">
-            and e.unit_type = 1
-            and e.id = #{supplyEntId}
+            and b.unit_type = 1
+            and b.id = #{supplyEntId}
         </if>
         order by a.create_time desc
     </select>
@@ -207,4 +207,73 @@
         order by a.create_time desc
     </select>
 
+    <select id="queryList1" resultType="com.sckw.contract.model.dto.res.QueryListResDto">
+        select a.amount,
+        a.trading,
+        a.name contractName,
+        a.contract_no,
+        a.create_by initiateBy,
+        a.create_time initiateTime,
+        a.create_time,
+        a.start_time,
+        a.end_time,
+        a.id,
+        a.remark,
+        a.signing_way,
+        a.create_time signTime,
+        a.status,
+        b.unit_type,
+        b.ent_id,
+        b.firm_name entName,
+        b.ent_id targetEntId,
+        b.firm_name targetEntName,
+        a.contract_pid contractPid,
+        a.performed_amount performedAmount,
+        f.name contractPname,
+        a.unload_way   unloadWay,
+        a.signing_way signingWay
+        from kwc_contract_trade a
+        left join kwc_contract_trade_unit b
+        on a.id = b.contract_id
+        and b.del_flag = 0
+
+        left join kwc_contract_trade f on f.id = a.contract_pid
+        where a.del_flag = 0
+        <if test="startTime != null">
+            and a.create_time >= #{startTime}
+        </if>
+        <if test="endTime != null">
+            and a.create_time &lt;= #{endTime}
+        </if>
+        <if test="status != null">
+            and a.status = #{status}
+        </if>
+        <if test="trading != null">
+            and a.trading = #{trading}
+        </if>
+        <if test="signingWay != null">
+            and a.signing_way = #{signingWay}
+        </if>
+        <if test="targetEntId != null">
+            and b.ent_id = #{targetEntId}
+        </if>
+        <if test="contractCode != null  and '' != contractCode">
+            and a.contract_no like concat('%',#{contractCode},'%')
+        </if>
+        <if test="contractName != null  and '' != contractName">
+            and a.name  like concat('%',#{contractName},'%')
+        </if>
+        <if test="supplementCode != null  and '' != supplementCode">
+            and f.contract_no  like concat('%',#{supplementCode},'%')
+        </if>
+        <if test="purchaseEntId != null  and '' != purchaseEntId">
+            and b.unit_type = 2
+            and b.id  = #{purchaseEntId}
+        </if>
+        <if test="supplyEntId != null  and '' != supplyEntId">
+            and b.unit_type = 1
+            and b.id = #{supplyEntId}
+        </if>
+        order by a.create_time desc
+    </select>
 </mapper>