关闭导入入口

src/main/java/common/controller/ContractController.java

@@ -474,10 +474,10 @@ public class ContractController {
 
     }
 
-    @RequestMapping(value = "/upload", method = RequestMethod.POST)
-    @ResponseBody
-    public ResultModel fileUpload2(@RequestParam("file") MultipartFile file, @PathVariable String platform) {
-        return service.uploadBatchInfo(file, platform);
+    //@RequestMapping(value = "/upload", method = RequestMethod.POST)
+    //@ResponseBody
+    public ResultModel fileUpload2(@RequestParam("file") MultipartFile file, @PathVariable String platform,@CurrentAccount User loginAccount) {
+        return service.uploadBatchInfo(file, platform,loginAccount);
     }
 
     @RequestMapping(value = "/upload/tempurl", method = RequestMethod.GET)

src/main/java/common/service/ContractService.java

@@ -75,7 +75,7 @@ public interface ContractService {
 
     List<ContractMoney> findPayAll(User loginAccount,String startDate, String endDate, String platform, String moneyType, String packageType, String money_ids);
 
-    ResultModel uploadBatchInfo(MultipartFile file, String platform);
+    ResultModel uploadBatchInfo(MultipartFile file, String platform, User loginAccount);
 
     Object getBarrioCities();
 }
\ No newline at end of file

src/main/java/common/service/impl/ContractServiceImpl.java

@@ -12,13 +12,10 @@ import net.sf.json.JSONArray;
 import org.apache.poi.ss.usermodel.*;
 import org.joda.time.DateTime;
 import org.joda.time.Days;
-import org.joda.time.format.DateTimeFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
@@ -44,10 +41,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.text.DateFormat;
-import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.function.Function;
@@ -2487,7 +2481,7 @@ public class ContractServiceImpl implements ContractService {
 
 
     @Override
-    public ResultModel uploadBatchInfo(MultipartFile file, String platform) {
+    public ResultModel uploadBatchInfo(MultipartFile file, String platform, User loginAccount) {
         InputStream stream = null;
         try {
             int row_length;
@@ -2504,7 +2498,7 @@ public class ContractServiceImpl implements ContractService {
 //            while (sheetIter.hasNext()) {
 //                Sheet sheet = sheetIter.next();
 //            }
-            return saveDataBySheet(workbook.getSheetAt(0), row_length, platform);
+            return saveDataBySheet(workbook.getSheetAt(0), row_length, platform,loginAccount);
 
         } catch (Exception ex) {
             logger.error("批量上传合同错误", ex);
@@ -2526,7 +2520,7 @@ public class ContractServiceImpl implements ContractService {
     }
 
 
-    public ResultModel saveDataBySheet(Sheet sheet, int row_length, String platformexcl) {
+    public ResultModel saveDataBySheet(Sheet sheet, int row_length, String platformexcl, User loginAccount) {
         String sheetName = sheet.getSheetName();
         if (!SHEET_NAMES.containsKey(sheetName)) {
             return ResultModel.ERROR("模板标签页名称错误");
@@ -2915,7 +2909,7 @@ public class ContractServiceImpl implements ContractService {
             s_data[row_already + 8] = ds;
 //            create_account,create_name,extra_flow,relation_contract,invoice_money,first_back_id
             s_data[row_already + 9] = 0;
-            s_data[row_already + 10] = "导入";
+            s_data[row_already + 10] = "导入-" + loginAccount.getName();
             if ("tkio".equals(platform)) {
                 s_data[row_already + 11] = -1;
                 s_data[row_already + 12] = 0;