批量导入功能异常问题修改

src/main/java/com/liang/controller/LsUserController.java

@@ -39,6 +39,7 @@ import java.io.InputStream;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.text.DateFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -248,6 +249,17 @@ public class LsUserController {
             // 开始解析这个文件
             List<List<String>> spreadsheetData = parseSpreadsheet(file.getInputStream(), fileExtension);
             System.out.println(spreadsheetData);
+            // 循环比较 spreadsheetData 中的 长度 是否与 各个元素相等
+            for (int i = 0;i<spreadsheetData.size();i++){
+                SysLsUserEntity sysLsUserEntity = new SysLsUserEntity();
+                if (spreadsheetData.get(i).size()!= spreadsheetData.get(0).size()){
+                    sysLsUserEntity.setXm(String.valueOf(i+1));
+                    sysLsUserEntity.setXmfzr("请将第"+(i+1)+"条数据补充完整");
+                    lists.add(sysLsUserEntity);
+                    spreadsheetData.remove(i);
+                }
+                continue;
+            }
             spreadsheetData.remove(0);
             List<SysLsUserEntity> list = new ArrayList<>();
             for (List<String> row : spreadsheetData) {
@@ -262,12 +274,11 @@ public class LsUserController {
                 employee.setZy(row.get(6));
                 employee.setQpsj(dateUtil.convertDate(row.get(7)));
                 employee.setDqsj(dateUtil.convertDate(row.get(8)));
+                System.out.println(row.get(9));
                 employee.setGznr(row.get(9));
                 // 将对象添加到列表中
                 list.add(employee);
             }
-            System.out.println(list);
-
             for(int i = 0; i<list.size();i++){
                 SysLsUserEntity sysLsUserEntity = new SysLsUserEntity();
                 // 校验合同起始时间和到期时间是否在三个月 内
@@ -302,18 +313,20 @@ public class LsUserController {
                Integer mum = lsUserService.saveOperLog(list.get(i));
                if (mum > 0){
                    h++;
-                   continue;
+                   // 循环比较 spreadsheetData 中的 长度 是否与 各个元素相等
                }
             }
         }catch (Exception a){
             a.printStackTrace();
+            h++;
         }
-
         // 获取文件名后缀
         if (h == 0){
             return BaseResult.failure(43,"成员录入失败,人员已存在！");
         }
         return BaseResult.success("成员录入成功",lists);
+
+
     }
     private List<List<String>> parseSpreadsheet(InputStream inputStream, String fileExtension) throws IOException {
         Workbook workbook = null;

src/main/java/com/liang/controller/StaMeetingFeeController.java

@@ -4,7 +4,6 @@ import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
 import com.liang.common.base.BaseController;
 import com.liang.common.base.BaseResult;
-import com.liang.entity.StaIntellectualProperty;
 import com.liang.entity.StaMeetingFee;
 import com.liang.service.StaMeetingFeeService;
 import org.springframework.data.domain.Page;

src/main/resources/mapper/LsUserDao.xml

@@ -53,7 +53,6 @@
                 ,XB
                 ,SFZH
                 ,PHONE
-
                 ,BYXX
                 ,ZY
                 ,XL
@@ -75,7 +74,6 @@
                 ,#{xb}
                 ,#{sfzh}
                 ,#{phone}
-
                 ,#{byxy}
                 ,#{zy}
                 ,#{xl}

src/main/resources/templates/statistical/indirectCosts.html

@@ -23,36 +23,56 @@
             <legend>搜索信息(<b>收起-展开</b>)</legend>
             <div id="search-div" style="margin: 5px 10px -10px 0px">
                 <form class="layui-form" action="" lay-filter="search-form">
-                    <div class="layui-form-item">
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 30px">项目名称</label>
-                            <div class="layui-input-inline" style="width: 220px">
-                                <input type="text" id="XMMC" name="XMMC" autocomplete="off" class="layui-input">
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <label class="layui-form-label" style="width: 80px;">项目名称</label>
+                            <div class="layui-input-inline" style="width: 224px;">
+                                <input type="text" id="xmmc" name="xmmc" autocomplete="off" class="layui-input">
                             </div>
                         </div>
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <label class="layui-form-label" style="width: 80px;">erp编号</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <label class="layui-form-label" style="width: 80px;">费用申请号</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <input type="text" id="fysqbh" name="fysqbh" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <label class="layui-form-label" style="width: 80px;">年度</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <input type="text" id="nf" name="nf" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
 
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">创建日期</label>
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input"
-                                       readonly>
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
                             </div>
                             <div class="layui-form-mid">-</div>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input"
-                                       readonly>
+                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
                             </div>
                         </div>
-
-                        <div class="layui-inline">
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
+                                <i class="layui-icon"></i> 搜 索
                             </button>
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
+                        </div>
+                        <div class="layui-inline" style="margin-right: 10px;">
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
                             </button>
                         </div>
                     </div>
+
                 </form>
             </div>
         </fieldset>