Merge branch 'test' into master-20240326

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceNewImpl.java

@@ -180,6 +180,7 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         InsFeeOrderNew insFeeOrderNew = new InsFeeOrderNew();
         insFeeOrderNew.setId(IdGenerate.nextId());
         insFeeOrderNew.setCostsId(costsId);
+        insFeeOrderNew.setAgreementId(insAreaCompany.getAgreementId());
 
         //存储部门id与用户id
         InsOrders order = insOrdersService.getById(insAreaCompany.getOrderno());

src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -793,6 +793,12 @@
             <if test="day !=null  and  day !=''">
                 AND day(a.signdate) =#{day}
             </if>
+            <if test="partnerCompaniesName !=null  and  partnerCompaniesName  !=''">
+                AND   a.partner_companies_name =#{partnerCompaniesName}
+            </if>
+            <if test="companyName !=null  and  companyName  !=''">
+                and a.company_id =#{companyName}
+            </if>
         </where>
         GROUP BY  a.partner_companies_id
     </select>