From c0f0bf3c1c598c10d4eb80751960bca76da50b0d Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期五, 14 六月 2024 18:03:32 +0800
Subject: [PATCH] zjh 本地 2024/06/14 --1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 74 ++++++++++++++++++++++++++++++++++++-
1 files changed, 72 insertions(+), 2 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index 9b12ca8..c85003a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -1,12 +1,18 @@
package com.ltkj.web.controller.system;
import java.io.*;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONArray;
+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.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.base.Joiner;
@@ -24,6 +30,7 @@
import com.ltkj.system.domain.SysPost;
import com.ltkj.system.domain.SysUserPost;
import com.ltkj.system.service.*;
+import com.ltkj.web.controller.his.HisApiGetMethodService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -102,6 +109,10 @@
private TestMapper testMapper;
@Autowired
private ISysConfigService configService;
+ @Autowired
+ private ITjFlowingWaterService tjFlowingWaterService;
+ @Autowired
+ private HisApiGetMethodService hisApiGetMethodService;
/**
* 璇ヤ綋妫�绉戝涓嬪鎴峰垪琛ㄦ樉绀烘帴鍙�
@@ -1387,6 +1398,7 @@
* @param tjNumber
* @return
*/
+ @Transactional
@GetMapping("/getParentList")
@ApiOperation(value = "鍖荤敓鐐瑰嚮浣撴淇℃伅璇︽儏(鍙樉绀虹埗椤圭洰鍒楄〃)")
public AjaxResult getParentList(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
@@ -1400,7 +1412,62 @@
}
ksId = Math.toIntExact(sysUser.getDeptId());
}
-
+ String configByKey = configService.selectConfigByKey("sfkqdyhis");
+ if (configByKey.equals("Y")){
+ // 鍒ゆ柇鏄惁鏀惰垂 璇锋眰鎺ュ彛
+ LambdaQueryWrapper<TjOrder> tjOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjOrderLambdaQueryWrapper.eq(TjOrder::getTjNumber,tjNumber);
+ TjOrder tjOrder = orderService.getOne(tjOrderLambdaQueryWrapper);
+ LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
+ tjFlowingWaterLambdaQueryWrapper.ne(TjFlowingWater::getPayStasus,2);
+ tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition,"N");
+ TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
+// if (tjFlowingWater1.getPayStasus() != 1){
+ LambdaQueryWrapper<TjCustomer> tjCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjCustomerLambdaQueryWrapper.eq(TjCustomer::getCusId,tjOrder.getUserId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(tjCustomerLambdaQueryWrapper);
+ HashMap<String, Object> hisRequestParams = new HashMap<>();
+ hisRequestParams.put("card_no",tjCustomer.getCusIdcard());
+ hisRequestParams.put("patientId",tjCustomer.getPationId());
+ AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
+ if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
+ List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data");
+ Date date = new Date();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ List<Map<String, String>> list = data.stream().filter(item -> String.valueOf(item.get("PayDate")).equals(dateFormat.format(date))).collect(Collectors.toList());
+ JSONArray jsonArray = JSONUtil.parseArray(list);
+ BigDecimal decimal = new BigDecimal("0");
+ for (Object o : jsonArray) {
+ JSONObject object = (JSONObject) o;
+ JSONArray items = object.getJSONArray("Items");
+ for (Object item : items) {
+ JSONObject jsonObject = (JSONObject) item;
+ BigDecimal fee = jsonObject.getBigDecimal("Fee");
+ decimal.add(fee);
+ }
+ }
+ if (decimal.compareTo(new BigDecimal("0")) != 0){
+ return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
+ }
+ tjFlowingWater.setPayStasus(1L);
+ tjFlowingWater.setPayType(0L);
+ tjFlowingWater.setTollCollectorId("148");
+ tjFlowingWaterService.updateById(tjFlowingWater);
+ Long tjSerialNumber = tjFlowingWater.getTjSerialNumber();
+ LambdaQueryWrapper<TjOrderDetail> tjOrderDetailLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjOrderDetailLambdaQueryWrapper.eq(TjOrderDetail::getOrderId,tjOrder.getOrderId());
+ List<TjOrderDetail> tjOrderDetails = detailService.list(tjOrderDetailLambdaQueryWrapper);
+ List<Long> detailIds = tjOrderDetails.stream().map(TjOrderDetail::getOrderDetailId).collect(Collectors.toList());
+ LambdaUpdateWrapper<TjOrderDetail> tjOrderDetailLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+ tjOrderDetailLambdaUpdateWrapper.set(TjOrderDetail::getFlowingWaterId,tjSerialNumber);
+ tjOrderDetailLambdaUpdateWrapper.in(TjOrderDetail::getOrderDetailId,detailIds);
+ detailService.update(tjOrderDetailLambdaUpdateWrapper);
+ }else {
+ return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
+ }
+// }
+ }
String config = configService.selectConfigByKey("qt_open_xdt");
String byKey = configService.selectConfigByKey("qt_kjksid");
List<Integer> split = new ArrayList<>(); // 瀛樻斁杞崲鍚庣殑integer绫诲瀷缁撴灉
@@ -1510,7 +1577,10 @@
// }
TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);
- List<TjProject> proParentList = projectService.getTjProjectListBySoneId(proParentId);
+
+// List<TjProject> proParentList = projectService.getTjProjectListBySoneId(proParentId);
+ List<TjProject> proParentList = projectService.getTjProjectListByTbTransition(proParentId,tjNumber);
+
if (null == proParentList || proParentList.size()==0) {
Map<String, Object> map = new HashMap<>();
map.put("xiaoJieIds", null);
--
Gitblit v1.8.0