diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java index dfbfda4030..b2caeaeb6a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java @@ -151,4 +151,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 04b13e314d..ccac704a96 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -1745,10 +1745,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService collectionDetails = creditResult.getResultDetails() == null ? new ArrayList<>() : creditResult.getResultDetails(); //准备 物料列表的数据 ResultBean>> vehicleListMap = createVehicleListsForReceivableBill(collectionDetails); @@ -104,7 +108,9 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService { m.put("FCOSTDEPARTMENTID", c.getDearDept()); m.put("FNOTAXAMOUNTFOR", c.getExTaxMoney()); m.put("F_PAEZ_Assistant1", c.getUseTo()); - m.put("FCOMMENT",c.getRemarks()); + if(StringUtils.isNotBlank(c.getRemarks())){ + m.put("FCOMMENT",c.getRemarks()); + } collectionDetailMap.add(m); } return rb.success().setData(collectionDetailMap); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json index cd60404172..7efaa1cf79 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json @@ -3,7 +3,7 @@ "FBillTypeID": { "FNUMBER": "QTYSD01_SYS" }, - "FBillNo": "@KD_FBillNo", + "FBillNo": "", "FDATE": "@KD_FDATE", "FENDDATE_H": "@KD_FENDDATE_H", "FISINIT": "false",