|
|
@@ -1,13 +1,11 @@
|
|
|
package com.huyi.service.financeRecord.controller;
|
|
|
|
|
|
-import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.huyi.service.base.entity.*;
|
|
|
import com.huyi.service.base.service.*;
|
|
|
import com.huyi.service.common.flowable.service.ApprovalService;
|
|
|
import com.huyi.service.financeRecord.service.FinanceRecordService;
|
|
|
-import com.huyi.service.util.FlowableService;
|
|
|
import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
|
|
|
import com.tianhu.common.core.constant.SalaryConstants;
|
|
|
import com.tianhu.common.core.domain.R;
|
|
|
@@ -28,16 +26,13 @@ import org.apache.commons.lang3.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.cglib.beans.BeanMap;
|
|
|
import org.springframework.core.io.UrlResource;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.io.*;
|
|
|
-import java.lang.reflect.InvocationTargetException;
|
|
|
import java.net.HttpURLConnection;
|
|
|
-import java.net.MalformedURLException;
|
|
|
import java.net.URL;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
@@ -245,6 +240,7 @@ public class FinanceRecordController extends BaseController {
|
|
|
map.put("zfiSupplierId",zfiSupplierId);
|
|
|
//融资金额
|
|
|
String zfrAmount = CommonUtil.objToString(map.get("zfrAmount"));
|
|
|
+ map.put("zfrAmountCN", com.keao.tianhu.core.util.AmtUtil.convert(zfrAmount));
|
|
|
//融资收款账号
|
|
|
String zfrCollectionAccount = CommonUtil.objToString(map.get("zfrCollectionAccount"));
|
|
|
//融资利率
|
