|
@@ -1,5 +1,6 @@
|
1
|
1
|
package com.liang.controller;
|
2
|
2
|
|
|
3
|
+import cn.hutool.core.util.StrUtil;
|
3
|
4
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
4
|
5
|
import com.github.pagehelper.PageHelper;
|
5
|
6
|
import com.github.pagehelper.PageInfo;
|
|
@@ -994,7 +995,7 @@ public class StaBudgetapprovalController extends BaseController {
|
994
|
995
|
@RequestMapping(value = "/updateSpzt", method = RequestMethod.POST)
|
995
|
996
|
public BaseResult updateSpzt(@RequestBody String strData) {
|
996
|
997
|
StaBudgetapproval fysq = JsonTool.parseObject(strData, StaBudgetapproval.class);
|
997
|
|
- if (fysq.getSpzt().equals("审批结束")) {
|
|
998
|
+ if (fysq.getSpzt().equals("审批结束")&&(StrUtil.isNotBlank(fysq.getOperations())&&!"bathsp".equals(fysq.getOperations()))) {
|
998
|
999
|
DateFormat dateFormat = new SimpleDateFormat("yyyy");
|
999
|
1000
|
PrjProject project = prjProjectService.queryById(fysq.getXmid());
|
1000
|
1001
|
if (project != null && project.getXmlxmc().indexOf("政府") > 0) {
|