费用申请-科研费号统一由定时任务生成

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

@@ -270,7 +270,7 @@ public class StaBudgetapprovalController extends BaseController {
             PrjApproverecord approveInfo = approveList.get(0);
             approveInfo.setSqje(sqje);
 
-            if (spzt.equals(PostInfoEnum.YZ.postName()+"审批") || spzt.equals(PostInfoEnum.ZGYLD.postName() + "审批") && sqje < 1000000) {
+            if (spzt.equals(PostInfoEnum.YZ.postName() + "审批") || spzt.equals(PostInfoEnum.ZGYLD.postName() + "审批") && sqje < 1000000) {
                 approveInfo.setSpcz("批量审批");
                 approveInfo.setYj("通过");
             } else {
@@ -303,7 +303,7 @@ public class StaBudgetapprovalController extends BaseController {
             }
             res.put("approveInfo", approveInfo);
         } else {
-           throw new CustomException("费用申请批量审批ERROR:数据不匹配,xmid:",xmid);
+            throw new CustomException("费用申请批量审批ERROR:数据不匹配,xmid:", xmid);
         }
         return res;
 
@@ -311,6 +311,7 @@ public class StaBudgetapprovalController extends BaseController {
 
     @Resource
     private SysUserPostService sysUserPostService;
+
     /**
      * 编辑数据（费用申请）
      *
@@ -990,25 +991,7 @@ public class StaBudgetapprovalController extends BaseController {
     @RequestMapping(value = "/updateSpzt", method = RequestMethod.POST)
     public BaseResult updateSpzt(@RequestBody String strData) {
         StaBudgetapproval fysq = JsonTool.parseObject(strData, StaBudgetapproval.class);
-        if (fysq.getSpzt().equals("审批结束")&&(StrUtil.isNotBlank(fysq.getOperations())&&!"bathsp".equals(fysq.getOperations()))) {
-            DateFormat dateFormat = new SimpleDateFormat("yyyy");
-            PrjProject project = prjProjectService.queryById(fysq.getXmid());
-            if (project != null && project.getXmlxmc().indexOf("政府") > 0) {
-                String partBh = "结转类(" + dateFormat.format(new Date()) + ")";
-                String bh = GetApproveRecordBH(partBh);
-                fysq.setBh(bh);
-            } else {
-                if (fysq.getSqje() < 1000000) {
-                    String partBh = "科研类(" + dateFormat.format(new Date()) + ")";
-                    String bh = GetApproveRecordBH(partBh);
-                    fysq.setBh(bh);
-                } else {
-                    String partBh = "大额科研类(" + dateFormat.format(new Date()) + ")";
-                    String bh = GetApproveRecordBH(partBh);
-                    fysq.setBh(bh);
-                }
-            }
-        } else {
+        if (fysq.getSpzt().equals("审批结束")) {
             fysq.setBh("");
         }
         int num = staBudgetapprovalService.updateSpzt(fysq);
@@ -1304,13 +1287,14 @@ public class StaBudgetapprovalController extends BaseController {
 
         return resultMap;
     }
+
     @ResponseBody
-    @RequestMapping(value = "/getAll",method = RequestMethod.GET)
-    public BaseResult getAll(){
+    @RequestMapping(value = "/getAll", method = RequestMethod.GET)
+    public BaseResult getAll() {
         Map<String, String> paraMap = new HashMap<>();
         List<FeeManagemant> list = prjProjectService.getFyglList(paraMap);
 
-    return BaseResult.success(list);
+        return BaseResult.success(list);
     }
 
 
@@ -1434,10 +1418,10 @@ public class StaBudgetapprovalController extends BaseController {
     public Object getSubNode(@PathVariable Integer nys,
                              @RequestParam Integer page,
                              @RequestParam Integer limit,
-                             @RequestParam(required = false ,value = "mc") String mc
+                             @RequestParam(required = false, value = "mc") String mc
     ) {
         Integer count = prjAnnualbudgetdetailService.getSubNodeCount(nys, page, limit);
-        List<PrjAnnualbudgetdetail> list = prjAnnualbudgetdetailService.getSubNode(nys, page, limit,mc);
+        List<PrjAnnualbudgetdetail> list = prjAnnualbudgetdetailService.getSubNode(nys, page, limit, mc);
 
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("code", 0);
@@ -1450,6 +1434,7 @@ public class StaBudgetapprovalController extends BaseController {
 
     /**
      * 未关联项目备用金列表
+     *
      * @return
      */
     @ResponseBody