From 5978bf12f908c76e18dd229293bdedd729e1183c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 31 七月 2024 14:38:39 +0800
Subject: [PATCH] zjh 2024/07/31-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 190be30..f8e7d83 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -8,6 +8,7 @@
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ltkj.common.annotation.RepeatSubmit;
@@ -297,7 +298,7 @@
tjOrder.setConfirmStatus(String.valueOf(status));
if (status == 0) {
tjOrder.setStatus(TjConstants.TJ_CHECK);
- asyncService.updateCheckType(tjNumber);
+// asyncService.updateCheckType(tjNumber);
} else {
tjOrder.setStatus(TjConstants.TJ_REFUSED);
}
@@ -307,8 +308,8 @@
confirmLog.setTjNum(tjNumber);
confirmLog.setStatus(status);
confirmLogService.save(confirmLog);
- asyncService.wCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 0, null, null, null));
- asyncService.yCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 1, null, null, null));
+// asyncService.wCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 0, null, null, null));
+// asyncService.yCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 1, null, null, null));
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
return AjaxResult.error("鎿嶄綔澶辫触");
@@ -594,9 +595,9 @@
if ("Y".equals(getInfoFromSqlData)) {
tbhyxm(order);
//鍚屾鍖栭獙椤圭洰
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
//鍚屾妫�鏌ラ」鐩�
- testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
asyncService.updateCheckType(order.getTjNumber());
}
@@ -641,7 +642,8 @@
hysqd.setShrdm(jsonObject.getStr("JYYSBH"));
hysqd.setShrxm(jsonObject.getStr("JYYSQM"));
hysqd.setJybgjg(jsonObject.getStr("JYBGJG"));
- List<LtkjHysqd> list = ltkjHysqdService.listByMap(BeanUtil.beanToMap(hysqd));
+ QueryWrapper<LtkjHysqd> queryWrapper = new QueryWrapper<>(hysqd);
+ List<LtkjHysqd> list = ltkjHysqdService.list(queryWrapper);
if (list.isEmpty())
isInsertHysqd = true;
if (isInsertHysqd){
@@ -651,7 +653,7 @@
}
}
//鍚屾鍖栭獙椤圭洰
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
}
/*鍚屾妫�鏌� his鎺ュ彛*/
if (null != jianChaBaoGaoDan && jianChaBaoGaoDan.size() > 0) {
@@ -704,14 +706,15 @@
jcbgd.setJcbw(objectMap.get("JCBW").toString());
if (null != objectMap.get("SQRQSJ") || !objectMap.get("SQRQSJ").equals(""))
jcbgd.setSqsj(objectMap.get("SQRQSJ").toString());
- List<LtkjExamJcbgd> list = jcbgdService.listByMap(BeanUtil.beanToMap(jcbgd));
+ QueryWrapper<LtkjExamJcbgd> queryWrapper = new QueryWrapper<>(jcbgd);
+ List<LtkjExamJcbgd> list = jcbgdService.list(queryWrapper);
if (list.isEmpty())
jcbgdService.save(jcbgd);
}
List<LtkjExamJcbgd> list = jcsqdService.queryLtkjExamJcsqdByTjh(order.getCardId());
if (list.isEmpty())
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
- testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
}else {
return AjaxResult.error("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
}
@@ -720,7 +723,7 @@
return AjaxResult.success("鍚屾鎴愬姛");
}
//鍖栭獙
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
//妫�鏌�
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
return AjaxResult.success("鍚屾鎴愬姛");
@@ -764,7 +767,8 @@
bgd.setShysmc(js.getStr("SHRXM"));
bgd.setYcbz(js.getStr("YCTS"));
// bgd.setTpurl(js.getStr(""));
- List<LtkjHybgd> list = ltkjHybgdService.listByMap(BeanUtil.beanToMap(bgd));
+ QueryWrapper<LtkjHybgd> queryWrapper = new QueryWrapper<>(bgd);
+ List<LtkjHybgd> list = ltkjHybgdService.list(queryWrapper);
if (list.isEmpty())
ltkjHybgdService.save(bgd);
}
@@ -795,7 +799,8 @@
bgd.setShsj(js.getStr("BGRQ"));
bgd.setShys(hysqd.getShrdm());
bgd.setShysmc(hysqd.getShrxm());
- List<LtkjHybgd> list = ltkjHybgdService.listByMap(BeanUtil.beanToMap(bgd));
+ QueryWrapper<LtkjHybgd> queryWrapper = new QueryWrapper<>(bgd);
+ List<LtkjHybgd> list = ltkjHybgdService.list(queryWrapper);
if (list.isEmpty())
ltkjHybgdService.save(bgd);
}
@@ -1260,6 +1265,7 @@
tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
}
}else {
+ tjOrderDetail.setYcbz("");
tjOrderDetail.setProResult(tjOrderDetail.getProResult());
}
--
Gitblit v1.8.0