|
|
@@ -20,6 +20,7 @@ import com.jzg.commons.entity.finance.po.*;
|
|
|
import com.jzg.commons.entity.finance.vo.*;
|
|
|
import com.jzg.commons.entity.orders.po.InsOrderAdjust;
|
|
|
import com.jzg.commons.entity.po.EsmInsCompany;
|
|
|
+import com.jzg.commons.entity.po.InsFeeOrders;
|
|
|
import com.jzg.commons.entity.po.PtlAgreement;
|
|
|
import com.jzg.commons.entity.po.SysUploadFiles;
|
|
|
import com.jzg.commons.exception.SystemException;
|
|
|
@@ -29,6 +30,7 @@ import com.jzg.commons.util.MinioUtils;
|
|
|
import com.jzg.commons.util.ServletUtils;
|
|
|
import com.jzg.commons.util.idgen.IdGenerate;
|
|
|
import com.jzg.organization.client.EsmInsCompanyClient;
|
|
|
+import com.jzg.organization.client.InsFeeOrdersClient;
|
|
|
import com.jzg.organization.excel.listener.JyExcelListener;
|
|
|
import com.jzg.organization.excel.listener.OtherExcelListener;
|
|
|
import com.jzg.organization.excel.listener.ReceivbleExcelListener;
|
|
|
@@ -109,6 +111,9 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
@Autowired
|
|
|
private SysUserJzgInfoSalesmanService sysUserJzgInfoSalesmanService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private InsFeeOrdersClient insFeeOrdersClient;
|
|
|
+
|
|
|
@Value("${upload.file.path}")
|
|
|
private String uploadPath;
|
|
|
|
|
|
@@ -405,6 +410,9 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
String typeAttrName = Constant.ywyAttrTypeMap.get(typeAttr);
|
|
|
insPlyIncome.setTypeAttr(typeAttr);
|
|
|
insPlyIncome.setTypeAttrName(typeAttrName);
|
|
|
+ // 费用信息
|
|
|
+ List<InsFeeOrders> insFeeOrderByOrderNo = insFeeOrdersClient.getInsFeeOrderByOrderNo(insPlyIncome.getOrderNo());
|
|
|
+ insPlyIncome.setInsFeeOrders(CollUtil.getFirst(insFeeOrderByOrderNo));
|
|
|
});
|
|
|
}
|
|
|
return records;
|