From 086b0d677e761bb5d528e6f29232d663af6e83c7 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期二, 02 二月 2021 16:59:52 +0800
Subject: [PATCH] update baojiGroupBattGroup# processSurvey#
---
src/main/java/com/fgkj/services/User_taskService.java | 48 +++++++++++++++++++++++-------------------------
1 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/fgkj/services/User_taskService.java b/src/main/java/com/fgkj/services/User_taskService.java
index 4614370..a1b2585 100644
--- a/src/main/java/com/fgkj/services/User_taskService.java
+++ b/src/main/java/com/fgkj/services/User_taskService.java
@@ -253,33 +253,31 @@
public ServiceModel delete(User_task obj) {
TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
ServiceModel model = new ServiceModel();
- Boolean bl=true;
- if (obj.getTask_type()==2){
- if (!(mapper.del(obj)>0)) {
- bl=false;
+ Boolean bl = true;
+ try {
+ if (obj.getTask_type() == 2) {
+ bl = mapper.del(obj) > 0;
+ if (bl) bl = mapper.delsqlC(obj) > 0; //check
+ } else {
+ bl = mapper.del(obj) > 0;
+ if (bl) bl = mapper.delsqlT(obj) > 0; //test
}
- if (!(mapper.delsqlC(obj)>0)) {
- bl=false;
- }
- }else{
- if (!(mapper.del(obj)>0)) {
- bl=false;
- }
- if (!(mapper.delsqlT(obj)>0)) {
- bl=false;
- }
- }
- if(bl){
- dataSourceTransactionManager.commit(transactionStatus);
- model.setCode(1);
- model.setMsg("鍒犻櫎浣滀笟鎴愬姛!");
- }
- else{
+ } catch (Exception e) {
+ e.printStackTrace();
dataSourceTransactionManager.rollback(transactionStatus);
- model.setMsg("鍒犻櫎浣滀笟澶辫触!");
- }
- return model;
- }
+ model.setMsg("鍒犻櫎浣滀笟澶辫触!");
+ return model;
+ }
+ if (bl) {
+ dataSourceTransactionManager.commit(transactionStatus);
+ model.setCode(1);
+ model.setMsg("鍒犻櫎浣滀笟鎴愬姛!");
+ } else {
+ dataSourceTransactionManager.rollback(transactionStatus);
+ model.setMsg("鍒犻櫎浣滀笟澶辫触!");
+ }
+ return model;
+ }
//4.1浣滀笟绠＄悊鏌ヨuser_task鎵�鏈変俊鎭�
public ServiceModel serchByCondition(Task_Batt_Test tbt){
--
Gitblit v1.9.1