Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260622' into dev_jzg_lipf_v20260622

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -3997,6 +3997,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                     .set(InsPlyIncome::getAgreementName, agreementVo.getAgreementName())
                     .set(InsPlyIncome::getContactPerson, agreementVo.getDockingPerson())
                     .set(InsPlyIncome::getContactPersonPhone, agreementVo.getDockingPhone())
+                    .set(InsPlyIncome::getAgreementType, agreementVo.getAgreementType())
                     .in(InsPlyIncome::getId, updateIncomeIds);
             baseMapper.update(null, incomeUpdateWrapper);
             log.info("修改ins_ply_income保司信息完成，未对账数据条数: {}", updateIncomeIds.size());

tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -1971,9 +1971,8 @@
             <if test="settlementReportQueryVo.receiver != null and settlementReportQueryVo.receiver != ''">
                 AND ipi.contact_person = #{settlementReportQueryVo.receiver}
             </if>
-            <if test="settlementReportQueryVo.startTime != null and settlementReportQueryVo.startTime != ''">
-                AND ipi.signing_time BETWEEN #{settlementReportQueryVo.startTime} AND #{settlementReportQueryVo.endTime}
-                AND (ipii.invoice_time BETWEEN #{settlementReportQueryVo.startTime} AND #{settlementReportQueryVo.endTime}
+            <if test="settlementReportQueryVo.startTime != null and settlementReportQueryVo.startTime != '' and settlementReportQueryVo.endTime != null and settlementReportQueryVo.endTime != ''">
+                AND ((ipii.invoice_time BETWEEN #{settlementReportQueryVo.startTime} AND #{settlementReportQueryVo.endTime})
                 OR ipii.invoice_time IS NULL)
             </if>
         </where>