费用管理-资料费科研费号问题

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

@@ -1,9 +1,12 @@
 package com.liang.controller;
 
+import cn.hutool.core.util.StrUtil;
 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.common.exception.CustomException;
+import com.liang.common.utils.Tools;
 import com.liang.entity.StaSourceFee;
 import com.liang.service.StaSourceFeeService;
 import org.springframework.data.domain.Page;
@@ -110,25 +113,19 @@ public class StaSourceFeeController extends BaseController {
     public BaseResult batchInsert(@RequestBody String data, @PathVariable Integer zb) {
         //删除资料费
         staSourceFeeService.deleteByZb(zb);
-        DateFormat dateFormat = new SimpleDateFormat("yyyy");
-
         List<StaSourceFee> expenseList = JsonTool.parseArray(data, StaSourceFee.class);
-        for (int i = 0; i < expenseList.size(); i++) {
-            String partBh = "科研费号(" + dateFormat.format(new Date()) + ")";
-            String kyfh = GetApproveRecordBH(partBh);
-            expenseList.get(i).setKyfh(kyfh);
-            expenseList.get(i).setZb(zb);
+        if (Tools.isEmpty(expenseList) || Tools.isEmpty(data)) {
+            throw new CustomException("请录入差旅费");
         }
-        if (expenseList.size() > 0) {
-            int num = staSourceFeeService.insertBatch(expenseList);
-            if (num == expenseList.size()) {
-                return BaseResult.success("差旅费保存成功！");
-            } else {
-                return BaseResult.failure("差旅费保存失败！");
-            }
+        expenseList.forEach(item->item.setZb(zb));
+
+        int num = staSourceFeeService.insertBatch(expenseList);
+        if (num == expenseList.size()) {
+            return BaseResult.success("差旅费保存成功！");
         } else {
-            return BaseResult.success("没有要保存的信息");
+            return BaseResult.failure("差旅费保存失败！");
         }
+
     }
 
     private String GetApproveRecordBH(String partBh) {

src/main/resources/mapper/StaSourceFeeDao.xml

@@ -191,8 +191,17 @@
 
     <!--获取资料费列表-->
     <select id="getZlfList" resultMap="StaSourceFeeMap">
-        select e.*
+        select  e.ID,
+                e.ZB,
+                e.FYSQ,
+                e.BZFY,
+                e.TSMC,
+                e.CBS,
+                e.SL,
+                e.ZJ,
+                sb.bh kyfh
         from sta_SourceFee e
+        left join  sta_BudgetApproval sb on sb.id = e.zb
         where ZB = #{zb}
     </select>