修改还款问题

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/RepaymentServiceImpl.java

@@ -62,9 +62,9 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
     CommonServiceImpl commonService;
 
     public Page<RepaymentDto> queryForRepaymentPage(String sequenceNbr, String companyName, String loanPeriod,
-                                                    String messageState, String repayState, String repayDate,String period,int current, int size) {
+                                                    String messageState, String repayState, String repayDate, String period, int current, int size) {
         PageHelper.startPage(current, size);
-        List<RepaymentDto> list = repaymentMapper.queryPage(sequenceNbr, companyName, loanPeriod , messageState, repayState,repayDate,period);
+        List<RepaymentDto> list = repaymentMapper.queryPage(sequenceNbr, companyName, loanPeriod, messageState, repayState, repayDate, period);
         PageInfo<RepaymentDto> pages = new PageInfo(list);
         List<RepaymentDto> pagesList = pages.getList();
         if (CollectionUtil.isNotEmpty(pagesList)) {
@@ -160,7 +160,7 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
                 if (dateSend && repayment.getCronSendState() == RepaymentCronSendStateEnum.SEND.getCode()) {
                     //生成待办
                     String routhPath = commonService.getRouthPath(BusinessTypeEnum.HYGF_REPAY.getCode(), repayment);
-                    ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.还款.getCode(), repayment.getSequenceNbr(), createTaskName(repayment), repayment.getRegionalCompaniesCode(),routhPath);
+                    ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.还款.getCode(), repayment.getSequenceNbr(), createTaskName(repayment), repayment.getRegionalCompaniesCode(), routhPath);
                     String sequenceNbr = repaymentMapper.getSequenceNbrByName("户用光伏-投融");
                     List<String> todoUserIds = repaymentMapper.getTodoUserIds("%" + repayment.getRegionalCompaniesCode() + "%", sequenceNbr);
                     toDoTasksService.addToDoTasksByUserIds(todoUserIds, toDoTasks);
@@ -206,8 +206,9 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
             ExcelReader reader = ExcelUtil.getReader(file.getInputStream());
             List<List<Object>> read = reader.read(1);
             List<Repayment> repaymentList = new ArrayList<>();
-            for (List<Object> objects : read) {
-                checkExcel(objects);
+            for (int i = 0; i < read.size(); i++) {
+                List<Object> objects = read.get(i);
+                checkExcel(objects,i);
                 Repayment repayment = new Repayment();
                 String companyName = String.valueOf(objects.get(0));
                 for (DropDown dropDown : region) {
@@ -253,9 +254,10 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
         }
     }
 
-    private void checkExcel(List<Object> objects) {
+    private void checkExcel(List<Object> objects,int i) {
         if (objects.size() != 7) {
-            throw new BadRequest("模板列不是7个");
+            int col= i+2;
+            throw new BadRequest("第"+col+"行数据不符合规范,每一列需要有值");
         }
         String companyName = String.valueOf(objects.get(0));
         if (StrUtil.isEmpty(companyName)) {
@@ -358,7 +360,7 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
         Repayment repayment = BeanUtil.copyProperties(model, Repayment.class);
         try {
             this.saveOrUpdate(repayment);
-        }catch (Exception exception) {
+        } catch (Exception exception) {
             throw new BadRequest("有重复数据请检查,区域公司、期次、还款日期、放款批次唯一");
         }
     }