Selaa lähdekoodia

批量修改成一样的对接人后,批量结算这俩对接人还是显示俩,不能一起结算

lipf 2 kuukautta sitten
vanhempi
commit
c2bd005139

+ 1 - 2
tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -1882,8 +1882,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         InvoicingVo invoicingVo = platformSettlementVo.getInvoicingVo();
         log.info("平台结算:platformSettlement=[{}]", JSONUtil.toJsonStr(platformSettlementVo));
 
-        if (StrUtil.isBlank(platformSettlementVo.getInvoicingVo().getContactPerson())
-                || StrUtil.isBlank(platformSettlementVo.getInvoicingVo().getContactPersonPhone())){
+        if (StrUtil.isBlank(platformSettlementVo.getInvoicingVo().getContactPerson())){
             throw new SystemException("对接人信息不能为空");
         }
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

+ 5 - 3
tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -310,9 +310,11 @@
         <if test="companyId != null and companyId != ''">
             AND io.company_id = #{companyId}
         </if>
-        AND ipi.id not in (
-         select ipiil.income_id from   ins_ply_income_invoice_link	ipiil where  ipiil.invoice_type = #{invoiceType} and ipiil.is_delete  = 0
-        )
+        <if test="invoiceType != null and invoiceType != ''">
+            AND ipi.id not in (
+            select ipiil.income_id from   ins_ply_income_invoice_link	ipiil where  ipiil.invoice_type = #{invoiceType} and ipiil.is_delete  = 0
+            )
+        </if>
         <if test="orderNos != null and orderNos.size() > 0">
             AND io.id in
             <foreach collection="orderNos" item="id" open="(" separator="," close=")">