ly 1 жил өмнө
parent
commit
31782aa991

+ 2 - 3
src/main/java/cn/ezhizao/project/business/collection/controller/BizCollectionController.java

@@ -284,9 +284,8 @@ public class BizCollectionController extends BaseController {
                 .setCompanyId(bizArchiveInput.getCompanyId())
                 .setPaymentAmount(collectedAmount)
                 .setNonpaymentAmount(bizArchiveInput.getTrueAmount().subtract(collectedAmount))
-                .setIsNew(bizArchiveInput.getContractType());
-
-
+                .setIsNew(bizArchiveInput.getContractType())
+                .setBoss(bizArchiveInput.getBoss()).setParty(bizArchiveInput.getParty());
         BizArchiveInputDetail detailConditions = new BizArchiveInputDetail();
         detailConditions.setContractId(conditions.getId());
         List<BizArchiveInputDetail> details = contractDetailService.getList(detailConditions);

+ 7 - 7
src/main/resources/mybatis/business/BizCollectionMapper.xml

@@ -40,7 +40,7 @@
         (
         SELECT
         c.company_id,
-        GROUP_CONCAT( DISTINCT  date_format( c.actually_date, '%Y-%m-%d' )) AS actually_date,
+        GROUP_CONCAT( DISTINCT date_format( c.actually_date, '%Y-%m-%d' )) AS actually_date,
         com.NAME,
         detail.task_type_id,
         GROUP_CONCAT( DISTINCT u2.nick_name ) AS verifyName,
@@ -191,7 +191,7 @@
         ELSE ''
         END AS isProject,
         t2.amount AS detailAllAmount,
-        CASE WHEN t1.STATUS = 1 THEN t2.arrive_amount ELSE 0 END  AS reallyDetailAmount,
+        CASE WHEN t1.STATUS = 1 THEN t2.arrive_amount ELSE 0 END AS reallyDetailAmount,
         t1.verify_date as examineTime,
         t1.applier_id,
         t6.nick_name AS applierName,
@@ -199,7 +199,7 @@
         t7.name as typeName,
         t8.nick_name AS verifyName,
         t1.actually_date,
-        date_format(  t1.arrive_date, '%Y-%m-%d') as receiptDate
+        date_format( t1.arrive_date, '%Y-%m-%d') as receiptDate
         FROM
         biz_collection t1 right join biz_collection_detail t2 ON t1.id = t2.collection_id
         LEFT JOIN biz_company t3 ON t3.id = t1.company_id
@@ -289,7 +289,7 @@
     <sql id="getListSql">
         SELECT
         ai.boss,ai.party,
-            a.id, a.flow_no, a.subsidiary_id, a.subsidiary, a.subsidiary_name, a.subsidiary_bank_account, a.form_date
+        a.id, a.flow_no, a.subsidiary_id, a.subsidiary, a.subsidiary_name, a.subsidiary_bank_account, a.form_date
         , a.subsidiary_bank_name, a.company_id, b.name as company_name
         , a.is_new, a.is_project, a.project_name, a.project_no, a.project_main_name
         , a.amount
@@ -320,7 +320,7 @@
                 a.contract_id = #{contractId} AND
             </if>
             <if test="contractNo != null and contractNo != ''">
-                 ai.contract_no LIKE CONCAT('%',#{contractNo},'%') AND
+                ai.contract_no LIKE CONCAT('%',#{contractNo},'%') AND
             </if>
             <if test="flowNo != null  and formNo != '' ">
                 a.flow_no LIKE CONCAT('%',#{flowNo},'%') AND
@@ -396,11 +396,11 @@
             </if>
 
             <if test="boss != null  and boss != '' ">
-                ai.boss = #{boss} AND
+                ai.boss LIKE CONCAT('%', #{boss},'%') AND
             </if>
 
             <if test="party != null  and party != '' ">
-                ai.party = #{party} AND
+                ai.party LIKE CONCAT('%', #{party},'%') AND
             </if>
         </trim>
     </sql>

+ 2 - 2
src/main/resources/mybatis/business/BizPaymentMapper.xml

@@ -161,10 +161,10 @@
             AND t1.accept_account_no = #{acceptAccountNo}
         </if>
         <if test="boss != null">
-            AND t4.boss = #{boss}
+            AND t4.boss like concat('%',#{boss},'%' )
         </if>
         <if test="party != null">
-            AND t4.party = #{party}
+            AND t4.party like concat('%',#{party},'%' )
         </if>
         <if test="accountBank != null and accountBank != ''">
             AND t1.account_bank = #{accountBank}