From 0bf1c5465f1f3198c53ad02f3209148afabb2038 Mon Sep 17 00:00:00 2001
From: kimi42345 <kimi42345@outlook.com>
Date: 星期二, 17 三月 2020 11:24:45 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs_spring
---
src/main/java/com/highdatas/srs/web/SchemeDetailController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/highdatas/srs/web/SchemeDetailController.java b/src/main/java/com/highdatas/srs/web/SchemeDetailController.java
index ee7df9a..9e5ca44 100644
--- a/src/main/java/com/highdatas/srs/web/SchemeDetailController.java
+++ b/src/main/java/com/highdatas/srs/web/SchemeDetailController.java
@@ -5,6 +5,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.highdatas.srs.entity.*;
import com.highdatas.srs.pojo.CodeMsg;
import com.highdatas.srs.pojo.Result;
@@ -97,8 +98,16 @@
String desp = request.getParameter("desp");
SchemeDetail schemeDetail = schemeDetailService.selectById(id);
schemeDetail.setFinish(true);
+ schemeDetail.setFinishTime(new Date());
new ProjectDeal().setId(DbUtils.getUUID()).setDesp(desp).setSchemeDetailId(id).setCreateTime(new Date()).insert();
schemeDetail.updateById();
+ Wrapper<SchemeDetail> eq = new EntityWrapper<SchemeDetail>().eq("parent_id", schemeDetail.getParentId()).eq("finish", false);
+ int i = schemeDetailService.selectCount(eq);
+ if (i == 0) {
+ Scheme scheme = schemeService.selectById(schemeDetail.getParentId());
+ scheme.setStatus("finish");
+ scheme.updateById();
+ }
return Result.success(schemeDetail);
}
@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
@@ -188,6 +197,7 @@
pre = schemeDetailService.selectOne(schemeDetailEntityWrapper);
if (pre == null) {
detail.setId(DbUtils.getUUID());
+ detail.setCreateTime(new Date());
detail.insert();
continue;
}
--
Gitblit v1.8.0