From e14e4217b3f53a5cad511b4331cd7c0a40a40db2 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 19 十二月 2024 13:52:03 +0800
Subject: [PATCH] zjh202412019
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 2150 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 1,592 insertions(+), 558 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 1756b81..268b0fc 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -4,11 +4,15 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.time.OffsetTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.*;
+import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Resource;
@@ -17,23 +21,43 @@
import cn.hutool.core.codec.Base64;
import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.symmetric.DES;
import cn.hutool.extra.pinyin.PinyinUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.JSON;
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.fasterxml.jackson.databind.BeanProperty;
+import com.itextpdf.text.Document;
+import com.itextpdf.text.DocumentException;
+import com.ltkj.common.annotation.RepeatSubmit;
import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.enums.DataSourceType;
-import com.ltkj.common.utils.SecurityUtils;
+import com.ltkj.common.utils.*;
import com.ltkj.framework.config.MatchUtils;
+import com.ltkj.framework.config.ThreadPoolConfig;
import com.ltkj.framework.config.UserHoder;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.dto.QianDaoDto;
+import com.ltkj.hosp.dto.TjProBlDto;
+import com.ltkj.hosp.hisDto.OutpinimpapplyDto;
+import com.ltkj.hosp.hisDto.OutpinmedicapplyDto;
import com.ltkj.hosp.mapper.TestMapper;
+import com.ltkj.hosp.mapper.TjSamplingMapper;
+import com.ltkj.hosp.pacsDto.SavePacsApply;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.LtkjMiddleDetail;
import com.ltkj.hosp.sqlDomain.LtkjMiddleHead;
@@ -48,19 +72,28 @@
import com.ltkj.mall.mallOrderUtils.TjConstants;
import com.ltkj.mall.service.IMallCheckLogService;
import com.ltkj.mall.service.IMallOrderService;
-import com.ltkj.system.service.ISysConfigService;
-import com.ltkj.system.service.ISysDeptService;
-import com.ltkj.system.service.ISysUserService;
+import com.ltkj.system.domain.TjDjdDyjl;
+import com.ltkj.system.service.*;
+import com.ltkj.web.controller.his.*;
+import com.ltkj.web.controller.lis.LisApiMethod;
+import com.ltkj.web.controller.pacs.PacsApiMethodService;
+import com.ltkj.web.controller.service.TjSysAsyncServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.DateFormatUtils;
import org.aspectj.weaver.ast.Var;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpRequest;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.DigestUtils;
import org.springframework.web.bind.annotation.*;
import com.ltkj.common.annotation.Log;
@@ -69,6 +102,8 @@
import com.ltkj.common.enums.BusinessType;
import com.ltkj.common.utils.poi.ExcelUtil;
import com.ltkj.common.core.page.TableDataInfo;
+
+import static com.ltkj.web.config.pdfutils.PDFBinaryUtil.getPDFBinary;
/**
* 浣撴璁板綍Controller
@@ -111,55 +146,99 @@
private TjAsyncService asyncService;
@Resource
private ISysUserService userService;
-
@Resource
private RedisCache redisCache;
@Autowired
private ITjReportPrintService tjReportPrintService;
-
@Resource
private ITjPrintOrderService printOrderService;
-
@Resource
private IJimuOnlineReportService reportService;
-
@Resource
private ITjSurveyRecordService surveyRecordService;
-
@Autowired
private IMallOrderService mallOrderService;
@Autowired
private IMallCheckLogService mallCheckLogService;
@Resource
private ITjDwDeptService dwDeptService;
-
@Resource
private ITjDwGroupingService dwGroupingService;
-
@Resource
private ITjOrderDetailRulesService orderDetailRulesService;
-
@Resource
private ITjRulesService rulesService;
-
@Autowired
private ITjAskMedicalHistoryService tjAskMedicalHistoryService;
-
@Autowired
private ITjReportGetAddressService tjReportGetAddressService;
-
@Resource
private TestMapper testMapper;
-
@Resource
private LtkjMiddleDetailService middleDetailService;
-
@Resource
private LtkjMiddleHeadService headService;
@Resource
private TjvLtkjvtjpatService tjvLtkjvtjpatService;
+ @Autowired
+ private ThreadPoolConfig threadPoolConfig;
+ @Autowired
+ private HisApiMethod hisApiMethod;
+ @Autowired
+ private HisApiGetMethodService hisApiGetMethodService;
+ @Autowired
+ private ISysDeptService sysDeptService;
+ @Autowired
+ private HisApiMethodService controller;
+ @Autowired
+ private TjProBlService blService;
+ @Resource
+ private ITjReportTemplateService reportTemplateService;
+ @Autowired
+ private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;
+ @Autowired
+ private PacsApiMethodService pacsApiMethodService;
+ @Autowired
+ private ITbTransitionService tbTransitionService;
+ @Autowired
+ private LisApiMethod lisApiMethod;
+ @Autowired
+ private TjCfService cfService;
+ @Autowired
+ private TjReportController reportController;
+ @Resource
+ private ITjReportService tjReportService;
+ @Autowired
+ private HisPDFUtil hisPDFUtil;
+ @Value("${path.reportServer}")
+ private String urlValue;
+ @Autowired
+ private ITjSamplingService samplingService;
+ @Autowired
+ private TjSamplingMapper tjSamplingMapper;
+ @Autowired
+ private ITjGroupingProService groupingProService;
+ @Autowired
+ private ITjDjdDyjlService djdDyjlService;
+ @Autowired
+ private IdUtils idUtils;
+ @Autowired
+ private LtkjJybbzdService jybbzdService;
+ @Autowired
+ private LisJyflhbService lisJyflhbService;
+ @Autowired
+ private ISysDictDataService sysDictDataService;
+ //灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
+ public JSONObject getJSONObject(String builder) {
+ String Response = JSONUtil.parseObj(builder).getStr("Response");
+ return JSONUtil.parseObj(Response);
+ }
+ //鑾峰彇鏂规硶杩斿洖鍊间俊鎭�
+ public String getAjaxResult(AjaxResult result) {
+ return result.get("data").toString();
+ }
/**
* 鏌ヨ浣撴璁板綍鍒楄〃
@@ -332,70 +411,23 @@
@ApiOperation(value = "鏌ヨ浣撴璁板綍鍒楄〃")
public AjaxResult getOrderList(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @ApiParam(value = "鐘舵��") @RequestParam(required = false) Integer zt,
@ApiParam(value = "浣撴鍙�)") @RequestParam(required = false) String tjNum,
@ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
+ @ApiParam(value = "椤圭洰鍚�)") @RequestParam(required = false) String xmmc,
@ApiParam(value = "鐧昏寮�濮嬫椂闂�") @RequestParam(required = false) Date djbeginTime,
@ApiParam(value = "鐧昏缁撴潫鏃堕棿") @RequestParam(required = false) Date djendTime,
@ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) Date bgbeginTime,
- @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) Date bgendTime) {
+ @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) Date bgendTime,
+ @ApiParam(value = "鍗曚綅") @RequestParam(required = false) String dw) {
Map<String, Object> map = new HashMap<>();
+ List<Long> cusIds = null;
if (null != name) {
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
wqq.like(TjCustomer::getCusName, name);
- List<TjCustomer> customerList = tjCustomerService.list(wqq);
- if (null != customerList && customerList.size() > 0) {
- List<TjOrder> list = new ArrayList<>();
- for (TjCustomer customer : customerList) {
- LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
- if (null != djbeginTime && null != djendTime) {
- wq.between(TjOrder::getCreateTime, DateUtil.beginOfDay(djbeginTime), DateUtil.endOfDay(djendTime));
- }
- wq.eq(TjOrder::getUserId, customer.getCusId());
- list.addAll(tjOrderService.list(wq));
- }
- List<TjOrder> collect = null;
- if (list.size() > 0) {
- for (TjOrder order : list) {
- TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
- if (null != tjCustomer) {
-// order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
- order.setTjCustomerName(tjCustomer.getCusName());
-// order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
- order.setTjCustomerPhone(tjCustomer.getCusPhone());
-// order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
- order.setTjCusIdCard(tjCustomer.getCusIdcard());
- order.setTjCustomerSex(tjCustomer.getCusSex());
- order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
- order.setCareer(tjCustomer.getCareer());
- order.setIdType(tjCustomer.getIdType());
- order.setAgeUnit(tjCustomer.getAgeUnit());
- order.setTjCount(String.valueOf(tjCustomer.getCusNumber()));
- }
- String firmId = order.getFirmId();
- if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
- order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName());
- }
- if (null != order.getPacId()) {
- if (null != tjPackageService.getById(order.getPacId())) {
- order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
- }
- if (null != dwDeptService.getById(order.getPacId())) {
- order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
- }
- }
- }
- collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
- }
- if (null != collect) {
- map.put("total", collect.size());
- } else {
- map.put("total", 0);
- }
- map.put("list", collect);
- return AjaxResult.success(map);
- }
-
+ cusIds = tjCustomerService.list(wqq).stream().map(TjCustomer::getCusId).collect(Collectors.toList());
}
+
Page<TjOrder> page1 = new Page<>(pageNum, pageSize);
LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
if (null != djbeginTime && null != djendTime) {
@@ -407,6 +439,114 @@
if (null != tjNum) {
wq.eq(TjOrder::getTjNumber, tjNum);
}
+
+
+ if (null != xmmc) {
+ wq.in(TjOrder::getTjNumber, projectService.getTjNumLIstByXmmx(xmmc));
+ }
+
+ if (StrUtil.isNotBlank(dw)) {
+ wq.like(TjOrder::getFirmName, dw);
+ }
+
+ if (null != cusIds && !cusIds.isEmpty()) {
+ wq.in(TjOrder::getUserId, cusIds);
+ }
+
+ if(null !=zt && (zt==0 || zt==1 || zt==2)){
+ List<TjOrder> orders=new ArrayList<>();
+ List<TjOrder> tjOrders=null;
+ List<TjOrder> orderList = tjOrderService.list(wq);
+ if(null !=orderList && !orderList.isEmpty()){
+ for (TjOrder order : orderList) {
+ int czwj = remarkService.panduaniscunzaiweijian(order.getTjNumber());
+ int sfwc = remarkService.panduaniswancheng(order.getTjNumber());
+ if (zt==0 && czwj == 0) {
+ //鏈0
+ order.setZt("鏈");
+ orders.add(order);
+ }
+ if (zt==1 && czwj > 0) {
+ //鍦ㄦ1
+ order.setZt("鍦ㄦ");
+ orders.add(order);
+ }
+ if (zt==2 && sfwc == 0 && order.getCheckStatus()==0 && order.getCheckTime()==null && order.getHeshouStatus()==0 && order.getPrintLastTime()==null) {
+ //宸插畬鎴�2
+ order.setZt("宸插畬鎴�");
+ orders.add(order);
+ }
+ }
+ if(!orders.isEmpty()){
+ tjOrders=orders.stream().sorted(Comparator.comparing(TjOrder::getCreateTime).reversed())
+ .skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+ for (TjOrder order : tjOrders) {
+ TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
+ if (null != tjCustomer) {
+ order.setTjCustomerSex(tjCustomer.getCusSex());
+ order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
+ order.setTjCustomerName(tjCustomer.getCusName());
+ order.setTjCustomerPhone(tjCustomer.getCusPhone());
+ order.setTjCusIdCard(tjCustomer.getCusIdcard());
+ order.setCareer(tjCustomer.getCareer());
+ order.setIdType(tjCustomer.getIdType());
+ order.setAgeUnit(tjCustomer.getAgeUnit());
+ order.setTjCount(String.valueOf(tjCustomer.getCusNumber()));
+ if (null != tjCustomer.getCompName()) {
+ order.setDictCompName(tjCustomer.getCompName());
+ } else {
+ String firmId = order.getFirmId();
+ if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
+ order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName());
+ }
+ }
+ if (null != order.getPacId()) {
+ if (null != tjPackageService.getById(order.getPacId())) {
+ order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
+ } else if (null != dwDeptService.getById(order.getPacId())) {
+ order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
+ }
+ }
+ TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber());
+ if (null != dycs) order.setDycs(Math.toIntExact(dycs.getDycs()));
+ }
+ }
+ }
+ }
+ map.put("list", tjOrders);
+ map.put("total", orders.size());
+ return AjaxResult.success(map);
+ }
+
+ if(null !=zt){
+ if(zt==3){
+ //宸插鏍�
+ wq.isNotNull(TjOrder::getCheckTime);
+ wq.eq(TjOrder::getCheckStatus,1);
+ wq.isNull(TjOrder::getHeshouTime);
+ wq.isNull(TjOrder::getPrintLastTime);
+ wq.eq(TjOrder::getHeshouStatus,0);
+ }
+ if(zt==4){
+ //鐢熸垚鎶ュ憡
+ wq.isNotNull(TjOrder::getReportTime);
+ wq.isNull(TjOrder::getHeshouTime);
+ wq.isNull(TjOrder::getPrintLastTime);
+ wq.eq(TjOrder::getHeshouStatus,0);
+ }
+ if(zt==5){
+ //鎶ュ憡鏍告敹
+ wq.eq(TjOrder::getHeshouStatus,1);
+ wq.isNull(TjOrder::getPrintLastTime);
+ }
+ if(zt==6){
+ //宸插嚭鎶ュ憡
+ wq.isNotNull(TjOrder::getPrintLastTime);
+ wq.eq(TjOrder::getHeshouStatus,1);
+ wq.isNotNull(TjOrder::getPrintLastTime);
+ }
+ }
+
wq.orderByDesc(TjOrder::getCreateTime);
Page<TjOrder> page2 = tjOrderService.page(page1, wq);
List<TjOrder> list = page2.getRecords();
@@ -416,26 +556,79 @@
if (null != tjCustomer) {
order.setTjCustomerSex(tjCustomer.getCusSex());
order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
- order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
order.setTjCustomerName(tjCustomer.getCusName());
- order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
-// order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+ order.setTjCustomerPhone(tjCustomer.getCusPhone());
order.setTjCusIdCard(tjCustomer.getCusIdcard());
order.setCareer(tjCustomer.getCareer());
order.setIdType(tjCustomer.getIdType());
order.setAgeUnit(tjCustomer.getAgeUnit());
order.setTjCount(String.valueOf(tjCustomer.getCusNumber()));
- }
- String firmId = order.getFirmId();
- if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
- order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName());
- }
- if (null != order.getPacId()) {
- if (null != tjPackageService.getById(order.getPacId())) {
- order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
+ if (null != tjCustomer.getCompName()) {
+ order.setDictCompName(tjCustomer.getCompName());
+ } else {
+ String firmId = order.getFirmId();
+ if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
+ order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName());
+ }
}
- if (null != dwDeptService.getById(order.getPacId())) {
- order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
+ if (null != order.getPacId()) {
+ if (null != tjPackageService.getById(order.getPacId())) {
+ order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
+ } else if (null != dwDeptService.getById(order.getPacId())) {
+ order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
+ }
+ }
+ TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber());
+ if (null != dycs) order.setDycs(Math.toIntExact(dycs.getDycs()));
+ }
+ int czwj = remarkService.panduaniscunzaiweijian(order.getTjNumber());
+ int sfwc = remarkService.panduaniswancheng(order.getTjNumber());
+ Date checkTime = order.getCheckTime();
+ Date reportTime = order.getReportTime();
+ Integer heshouStatus = order.getHeshouStatus();
+ Date lastTime = order.getPrintLastTime();
+
+ if(null !=zt){
+ if(zt==3){
+ order.setZt("宸插鏍�");
+ }
+ if(zt==4){
+ order.setZt("鐢熸垚鎶ュ憡");
+ }
+ if(zt==5){
+ order.setZt("鎶ュ憡鏍告敹");
+ }
+ if(zt==6){
+ order.setZt("宸插嚭鎶ュ憡");
+ }
+ }else {
+ if (czwj == 0) {
+ //鏈0
+ order.setZt("鏈");
+ }
+ if (czwj > 0) {
+ //鍦ㄦ1
+ order.setZt("鍦ㄦ");
+ }
+ if (sfwc == 0) {
+ //宸插畬鎴�2
+ order.setZt("宸插畬鎴�");
+ }
+ if (null != checkTime) {
+ //宸插鏍�3
+ order.setZt("宸插鏍�");
+ }
+ if (null != reportTime) {
+ //鐢熸垚鎶ュ憡4
+ order.setZt("鐢熸垚鎶ュ憡");
+ }
+ if (1== heshouStatus) {
+ //鎶ュ憡鏍告敹5
+ order.setZt("鎶ュ憡鏍告敹");
+ }
+ if (null != lastTime) {
+ //宸插嚭鎶ュ憡6
+ order.setZt("宸插嚭鎶ュ憡");
}
}
}
@@ -450,85 +643,41 @@
@ApiOperation(value = "浣撴鎶ュ憡椤甸潰鈥斺�斾綋妫�璁板綍鍒楄〃")
public AjaxResult getOrderListOO(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @ApiParam(value = "鎵撳嵃鏈墦鍗扮姸鎬� 0鏈墦鍗� 1宸叉墦鍗�") @RequestParam(required = false) Integer dyzt,
@ApiParam(value = "浣撴鍙�)") @RequestParam(required = false) String tjNum,
@ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
- @ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) Date bgbeginTime,
- @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) Date bgendTime) {
- Map<String, Object> map = new HashMap<>();
- if (null != name) {
+ @ApiParam(value = "鍗曚綅") @RequestParam(required = false) String dw,
+ @ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) String djbeginTime,
+ @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) String djendTime) {
+ /* Map<String, Object> map = new HashMap<>();
+ List<Long> cusIds = null;
+ if (StringUtil.isNotBlank(name)) {
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
wqq.like(TjCustomer::getCusName, name);
- List<TjCustomer> customerList = tjCustomerService.list(wqq);
- if (null != customerList && customerList.size() > 0) {
- List<TjOrder> list = new ArrayList<>();
- for (TjCustomer customer : customerList) {
- LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
- wq.isNotNull(TjOrder::getReportTime);
- wq.eq(TjOrder::getUserId, customer.getCusId());
- wq.eq(TjOrder::getHeshouStatus, 1); //鏍告敹鐘舵�佷负1鎵嶈兘鎵撳嵃
- list.addAll(tjOrderService.list(wq));
- }
- List<TjOrder> collect = null;
- if (list.size() > 0) {
-
- for (int i = 0; i < list.size(); i++) {
- TjCustomer tjCustomer = tjCustomerService.getById(list.get(i).getUserId());
- if (null == tjCustomer) {
- list.remove(list.get(i));
- continue;
- }
- list.get(i).setTjCustomerSex(tjCustomer.getCusSex());
- list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
- list.get(i).setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
- list.get(i).setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
- list.get(i).setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
-
- String firmId = list.get(i).getFirmId();
- if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) {
- list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName());
- }
- if (null != list.get(i).getPacId()) {
- if (null != tjPackageService.getById(list.get(i).getPacId())) {
- list.get(i).setPacName(tjPackageService.getById(list.get(i).getPacId()).getPacName());
- }
- if (null != dwDeptService.getById(list.get(i).getPacId())) {
- list.get(i).setPacName(dwDeptService.getById(list.get(i).getPacId()).getDwDeptName());
- }
- }
- //浠庢墦鍗拌褰曟煡鍑烘渶鏂版墦鍗版椂闂�
- LambdaQueryWrapper<TjReportPrint> wqqq = new LambdaQueryWrapper<>();
- wqqq.eq(TjReportPrint::getTjNumber, list.get(i).getTjNumber());
- wqqq.orderByDesc(TjReportPrint::getPrintTime);
- wqqq.last("limit 1");
- TjReportPrint one = tjReportPrintService.getOne(wqqq);
- if (one != null) {
- list.get(i).setPrintLastTime(one.getPrintTime());
- }
-
- }
- collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
- }
- if (null != collect) {
- map.put("total", collect.size());
- } else {
- map.put("total", 0);
- }
- map.put("list", collect);
- return AjaxResult.success(map);
- }
-
+ cusIds = tjCustomerService.list(wqq).stream().map(TjCustomer::getCusId).collect(Collectors.toList());
}
Page<TjOrder> page1 = new Page<>(pageNum, pageSize);
LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
- wq.isNotNull(TjOrder::getReportTime);
- wq.eq(TjOrder::getHeshouStatus, 1); //鏍告敹鐘舵�佷负1鎵嶈兘鎵撳嵃
- if (null != bgbeginTime && null != bgendTime) {
- wq.between(TjOrder::getCreateTime, DateUtil.beginOfDay(bgbeginTime), DateUtil.endOfDay(bgendTime));
+ if (dyzt == 0) {
+ wq.isNull(TjOrder::getPrintLastTime);
+ wq.eq(TjOrder::getHeshouStatus, 1); //鏍告敹鐘舵�佷负1鎵嶈兘鎵撳嵃
+ } else {
+ wq.isNotNull(TjOrder::getPrintLastTime);
+ }
+
+ if (null != djbeginTime && null != djendTime) {
+ wq.between(TjOrder::getCreateTime, DateUtil.beginOfDay(DateUtil.parseDate(djbeginTime)), DateUtil.endOfDay(DateUtil.parseDate(djendTime)));
}
if (null != tjNum) {
- wq.eq(TjOrder::getTjNumber, tjNum);
+ wq.like(TjOrder::getTjNumber, tjNum);
}
- wq.orderByDesc(TjOrder::getReportTime);
+ if (StringUtil.isNotBlank(dw)) {
+ wq.like(TjOrder::getFirmName, dw);
+ }
+ if (null != cusIds && !cusIds.isEmpty()) {
+ wq.in(TjOrder::getUserId, cusIds);
+ }
+ wq.orderByDesc(TjOrder::getCreateTime);
Page<TjOrder> page2 = tjOrderService.page(page1, wq);
List<TjOrder> list = page2.getRecords();
if (list != null) {
@@ -540,15 +689,19 @@
}
list.get(i).setTjCustomerSex(tjCustomer.getCusSex());
list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
- list.get(i).setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
- list.get(i).setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
+ list.get(i).setTjCustomerName(tjCustomer.getCusName());
+ list.get(i).setTjCustomerPhone(tjCustomer.getCusPhone());
if (tjCustomer.getCusIdcard() != null) {
- list.get(i).setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+ list.get(i).setTjCusIdCard(tjCustomer.getCusIdcard());
}
- String firmId = list.get(i).getFirmId();
- if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) {
- list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName());
+ if (null != tjCustomer.getCompName()) {
+ list.get(i).setDictCompName(tjCustomer.getCompName());
+ } else {
+ String firmId = list.get(i).getFirmId();
+ if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) {
+ list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName());
+ }
}
if (null != list.get(i).getPacId()) {
if (null != tjPackageService.getById(list.get(i).getPacId())) {
@@ -559,18 +712,22 @@
}
}
//浠庢墦鍗拌褰曟煡鍑烘渶鏂版墦鍗版椂闂�
- LambdaQueryWrapper<TjReportPrint> wqqq = new LambdaQueryWrapper<>();
- wqqq.eq(TjReportPrint::getTjNumber, list.get(i).getTjNumber());
- wqqq.orderByDesc(TjReportPrint::getPrintTime);
- wqqq.last("limit 1");
- TjReportPrint one = tjReportPrintService.getOne(wqqq);
- if (one != null) {
- list.get(i).setPrintLastTime(one.getPrintTime());
- }
+// LambdaQueryWrapper<TjReportPrint> wqqq = new LambdaQueryWrapper<>();
+// wqqq.eq(TjReportPrint::getTjNumber, list.get(i).getTjNumber());
+// wqqq.orderByDesc(TjReportPrint::getPrintTime);
+// wqqq.last("limit 1");
+// TjReportPrint one = tjReportPrintService.getOne(wqqq);
+// if (one != null) {
+// list.get(i).setPrintLastTime(one.getPrintTime());
+// }
}
}
map.put("list", list);
- map.put("total", page2.getTotal());
+ map.put("total", page2.getTotal());*/
+
+ if (djbeginTime == null) djbeginTime = "";
+ if (djendTime == null) djendTime = "";
+ Map<String, Object> map= tjOrderService.getTjBgdyList(pageNum,pageSize,dyzt,tjNum,name,dw,djbeginTime,djendTime);
return AjaxResult.success(map);
}
@@ -811,9 +968,14 @@
/**
* 浣撴绛惧埌鐧昏鎺ュ彛
*/
+
+
+ ReentrantLock lock = new ReentrantLock();
+
@PostMapping
@ApiOperation(value = "浣撴绛惧埌鐧昏鎺ュ彛")
- @Transactional //(鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�)
+// @Transactional //(鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�)
+ @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
public AjaxResult addOrderAndDetail(@RequestBody TjOrder tjOrder) throws Exception {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
@@ -821,37 +983,40 @@
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
wq.eq(TjCustomer::getCusId, tjOrder.getUserId());
TjCustomer tjCustomer = tjCustomerService.getOne(wq);
- if (tjCustomer == null) return AjaxResult.error("璇ュ鎴锋湭鐧昏鎴栦笉瀛樺湪");
+ if (tjCustomer == null) return AjaxResult.error("璇ュ鎴锋湭鐧昏");
LambdaQueryWrapper<TjOrder> wqq = new LambdaQueryWrapper<>();
wqq.eq(TjOrder::getUserId, tjOrder.getUserId());
wqq.eq(TjOrder::getCheckStatus, 0);
wqq.isNull(TjOrder::getFinishTime);
- if (!tjCustomer.getCardId().equals("0")) {
- wqq.eq(TjOrder::getCardId, tjCustomer.getCardId());
- }
+// if (!tjCustomer.getCardId().equals("0")) {
+ wqq.eq(TjOrder::getCardId, tjCustomer.getCardId());
+// }
TjOrder order = tjOrderService.getOne(wqq);
if (null != order) {
transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjCustomer.getCardId());
return AjaxResult.error("涓嶅彲閲嶅鐧昏");
}
+ TjFlowingWater tjFlowingWater = new TjFlowingWater();
LambdaQueryWrapper<TjReservation> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjReservation::getIdCard, tjCustomer.getCusIdcard());
wq1.eq(TjReservation::getIsExpire, 2);
TjReservation tjReservation = tjReservationService.getOne(wq1);
MallOrder mallOrder = null;
- if (tjReservation != null) {
+ if (null != tjReservation) {
+ tjOrder.setReservationId(tjReservation.getId());
mallOrder = mallOrderService.getOne(new LambdaQueryWrapper<MallOrder>().eq(MallOrder::getReservationId, tjReservation.getId()));
- if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
- return AjaxResult.error("鏈埌棰勭害鏃堕棿");
- }
- if (DateUtil.endOfDay(tjReservation.getReservationTime()).before(new Date())) {
+ // if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
+ // return AjaxResult.error("鏈埌棰勭害鏃堕棿");
+ // }
+ if (DateUtil.endOfDay(DateUtil.offsetDay(tjReservation.getReservationTime(), tjReservation.getYxts())).before(new Date())) {
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
return AjaxResult.error("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�");
}
if (null != tjReservation.getTeamNo()) tjOrder.setTeamNo(tjReservation.getTeamNo());
- if (null != tjReservation.getCompanyId()) tjOrder.setFirmId(tjReservation.getCompanyId());
+// if (null != tjReservation.getCompanyId()) tjOrder.setFirmId(tjReservation.getCompanyId());
+// if (null != tjReservation.getCompany()) tjOrder.setFirmName(tjReservation.getCompany());
if (null != tjReservation.getDepartment()) tjOrder.setFirmDeptName(tjReservation.getDepartment());
if (null != tjReservation.getJobNo()) tjOrder.setFirmWorkId(tjReservation.getJobNo());
if (null != tjReservation.getPacId()) tjOrder.setPacId(tjReservation.getPacId());
@@ -860,18 +1025,25 @@
tjOrder.setGroupId(tjReservation.getGroupingId());
tjOrder.setFirmDeptId(tjReservation.getPacId());
}
-// if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId());
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
- if (null != tjReservation.getTeamNo()) {
+ if (null != tjReservation.getTeamNo() && tjOrder.getTjType().equals("1")) {
tjOrder.setTjType("1");
- } else {
+ } else if (tjOrder.getTjType().equals("2")) {
tjOrder.setTjType("2");
}
}
- //鐢熸垚浣撴鍙�
- String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
- tjOrder.setTjNumber(tjNumber);
+
+ if (null != tjCustomer.getCompName()) {
+ tjOrder.setFirmName(tjCustomer.getCompName());
+ }
+ if (null != tjCustomer.getDictCompId()) {
+ tjOrder.setFirmId(String.valueOf(tjCustomer.getDictCompId()));
+ } else {
+ tjOrder.setFirmId("0");
+ }
+
+
if (null != tjOrder.getPhoto()) {
File file = new File(tjOrder.getPhoto());
if (file.isFile()) {
@@ -884,9 +1056,8 @@
tjOrder.setPhoto(encode);
}
}
- if (tjOrder.getFirmId() == null) {
- tjOrder.setFirmId("0");
- }
+
+
if (null == tjOrder.getPacId() && null != transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId()))) {
tjOrder.setPacId(transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId())));
}
@@ -894,6 +1065,37 @@
if (null != mallOrder) tjOrder.setMallOrderId(String.valueOf(mallOrder.getId()));
tjOrder.setStatus(TjConstants.TJ_BEGIN);
tjOrder.setCardId(tjCustomer.getCardId());
+ if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
+ tjOrder.setFinishTime(new Date());
+ tjOrder.setCheckStatus(1);
+ tjOrder.setStatus(TjConstants.TJ_WAIT);
+ // tjFlowingWater.setPayStasus(1L);
+ }
+ tjFlowingWater.setPayStasus(0L);
+
+ try {
+ boolean b = lock.tryLock(3, TimeUnit.MINUTES);
+ if (b) {
+ AjaxResult result = processOrderWithTransaction(tjOrder, tjCustomer, tjReservation, tjFlowingWater, mallOrder, sysUser);
+ if (!result.get("code").toString().equals("200"))
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ tjOrderService.tjQiandaodengji(tjOrder.getTjNumber());
+ return result;
+ }
+ } finally {
+ lock.unlock();
+ }
+ return AjaxResult.error();
+ }
+
+ @Transactional(propagation = Propagation.REQUIRES_NEW, isolation = Isolation.READ_COMMITTED)
+ public AjaxResult processOrderWithTransaction(TjOrder tjOrder, TjCustomer tjCustomer, TjReservation tjReservation, TjFlowingWater tjFlowingWater, MallOrder mallOrder, SysUser sysUser) {
+ //鐢熸垚浣撴鍙�
+ String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
+ tjOrder.setTjNumber(tjNumber);
+ BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount()));
+
+ tjOrder.setDiscount(discount.toString());
if (tjOrderService.save(tjOrder)) {
//淇濆瓨鏀惰揣鍦板潃
if ("2".equals(tjOrder.getGetType())) {
@@ -906,9 +1108,7 @@
Long cusNumber = tjCustomer.getCusNumber();
cusNumber += 1;
tjCustomer.setCusNumber(cusNumber);
- BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount())).divide(BigDecimal.valueOf(10));
- TjFlowingWater tjFlowingWater = new TjFlowingWater();
- tjFlowingWater.setPayStasus(0L);
+
if ("1".equals(tjOrder.getTjType())) {
if (null != tjReservation && tjReservation.getPayType() == 1) {
tjFlowingWater.setPayStasus(3L);
@@ -956,69 +1156,184 @@
mallOrder.setOrderStatus(301L);
mallOrderService.updateById(mallOrder);
}
- }
- else {
+ } else {
tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
-// tjFlowingWater.setPayStasus(0L);
+ // tjFlowingWater.setPayStasus(0L);
}
}
if (tjFlowingWaterService.save(tjFlowingWater)) {
tjOrder.setTjSerialNumber(String.valueOf(tjFlowingWater.getTjSerialNumber()));
tjOrderService.updateById(tjOrder);
+ }
+ //淇敼姣忛」鐨勫師浠风幇浠� //淇敼涓存椂琛ㄤ綋妫�鍙�
+ transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
+ /*璋冪敤his鎺ュ彛*/
+ String config = configService.selectConfigByKey("sfkqdyhis");
+ if (null != config && config.equals("Y")) {
+ AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder);
+ if (!result.get("code").toString().equals("200")) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ Object jzh = result.get("jzh");
+ if (null != jzh && null != jzh.toString()) {
+ hisApiMethod.ZfHisApiMethod(jzh.toString());
+ }
+ log.info("璇ョ櫥璁颁汉鎸傚彿澶辫触, 灏辫瘖鍙蜂负: " + tjOrder.getCardId());
+ return AjaxResult.error("鎸傚彿澶辫触!" + result.get("msg").toString());
+ }
+
+ log.info("璇ョ櫥璁颁汉鐨刪is灏辫瘖鍙锋槸: " + tjOrder.getCardId());
+ //鍥綋
+ if ("1".equals(tjOrder.getTjType())) {
+// asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
+ ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
+ }
+ //涓汉
+ if ("2".equals(tjOrder.getTjType())) {
+ //asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ }
+ // 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
+ if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
+ // 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
+ tjFlowingWater.setPayStasus(1L);
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result);
+ if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult;
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ } else {
+ hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+ }
+// hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+ return AjaxResult.success(tjNumber);
+ } else {
+ tjCustomer.setCardId(tjOrder.getTjNumber());
+ tjCustomerService.updateById(tjCustomer);
+ transitionService.updateCardIdByTjNumAndIdCard(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), tjOrder.getTjNumber());
+ tjOrder.setCardId(tjOrder.getTjNumber());
+ tjOrderService.updateById(tjOrder);
}
//鍥綋
if ("1".equals(tjOrder.getTjType())) {
+// asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
}
//涓汉
if ("2".equals(tjOrder.getTjType())) {
//asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
}
+ // 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
+ if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
+ // 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
+ tjFlowingWater.setPayStasus(1L);
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+// AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result);
+// if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult;
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
- //璋冪敤SQL server鎷垮彇鏀惰垂鎯呭喌
- //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
-// final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
-// if ("Y".equals(getInfoFromSqlData)){
-// List<LtkjMiddleHead> one = testMapper.saveMiddleHeadByPatId(tjCustomer.getCusIdcard());
-// if (one!=null){
-// for (LtkjMiddleHead ltkjMiddleHead : one) {
-// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
-// headService.save(ltkjMiddleHead);
-// DynamicDataSourceContextHolder.clearDataSourceType();
-// List<LtkjMiddleDetail> detailList = testMapper.getMiddleDetailByHeadId(ltkjMiddleHead.getFeadId());
-// if (detailList!=null){
-// for (LtkjMiddleDetail ltkjMiddleDetail : detailList) {
-// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
-// middleDetailService.save(ltkjMiddleDetail);
-// DynamicDataSourceContextHolder.clearDataSourceType();
-// }
-// }
-// }
-//
-// }
-// }
- tjCustomer.setCardId("0");
- tjCustomerService.updateById(tjCustomer);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+
+ }
+// pacsApiMethodService.OrderAdd(tjCustomer,tjOrder);
return AjaxResult.success(tjNumber);
}
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error();
}
+ public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser, String jxbz) {
+ if (null != detailList && detailList1) {
+ Date date = new Date();
+ String format = DateUtil.format(date, "yyMMddHHmmssSSS");
+ for (TjOrderDetail detail : detailList) {
+ TjSampling sampling = new TjSampling();
+ if (null == projectService.getById(detail.getProId())) continue;
+ TjProject project = projectService.getById(detail.getProId());
+ Long proParentId = project.getProParentId();
+ String dictLabel = sysDictDataService.selectDictLabel("sys_dict_specimen", project.getSpecimenType());
+ if (null != proParentId && proParentId == 0) {
+ sampling.setJyxh(idUtils.generateLisID());
+ sampling.setSpecimenTypeCode(project.getSpecimenType());
+ sampling.setSpecimenType(dictLabel);
+ sampling.setJyxmdm(project.getProId().toString());
+ } else {
+ TjProject project1 = projectService.getById(proParentId);
+ sampling.setJyxh(idUtils.generateLisID());
+
+ sampling.setSpecimenTypeCode(project1.getSpecimenType());
+ sampling.setSpecimenType(dictLabel);
+ sampling.setJyxmdm(project.getProId().toString());
+
+ }
+ sampling.setSamplingNumber(format);
+ sampling.setTjNum(order.getTjNumber());
+ sampling.setCusId(String.valueOf(order.getUserId()));
+ if (tjCustomerService.getById(String.valueOf(order.getUserId())) != null) {
+ sampling.setCusName(tjCustomerService.getById(String.valueOf(order.getUserId())).getCusName());
+ }
+ sampling.setApplicationTime(date);
+ sampling.setTjTime(order.getCreateTime());
+ sampling.setProId(String.valueOf(detail.getProId()));
+ sampling.setProName(projectService.getById(detail.getProId()).getProName());
+ sampling.setCreateBy(sysUser.getNickName());
+ sampling.setCreateTime(date);
+ sampling.setUpdateBy(sysUser.getNickName());
+ sampling.setUpdateTime(date);
+ sampling.setCreateId(String.valueOf(sysUser.getUserId()));
+ sampling.setUpdateId(String.valueOf(sysUser.getUserId()));
+ sampling.setJxbz(jxbz);
+ samplingService.save(sampling);
+ }
+ }
+ String config = configService.selectConfigByKey("sfkqdyhis");
+ if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))) {
+ AjaxResult ajaxResult = lisApiMethod.getJyFlHb();
+ if (ajaxResult.get("code").toString().equals("200")) {
+ String str = ajaxResult.get("data").toString();
+ str = str.replace("=", ":");
+ JSONArray array = JSONUtil.parseArray(str);
+ for (Object o : array) {
+ JSONObject object = (JSONObject) o;
+ LisJyflhb lisJyflhb = new LisJyflhb();
+ lisJyflhb.setHbhxm(object.getStr("hbhxm"));
+ lisJyflhb.setFlmc(object.getStr("flmc"));
+ lisJyflhb.setMc(object.getStr("mc"));
+ lisJyflhb.setFlbm(object.getStr("flbm"));
+ LambdaQueryWrapper<LisJyflhb> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(LisJyflhb::getFlbm, lisJyflhb.getFlbm());
+ LisJyflhb jyflhb = lisJyflhbService.getOne(wrapper);
+ if (jyflhb == null) {
+ lisJyflhb.setId(IdUtil.getSnowflake().nextId());
+ lisJyflhbService.save(lisJyflhb);
+ } else {
+ lisJyflhb.setId(jyflhb.getId());
+ lisJyflhbService.updateById(lisJyflhb);
+ }
+ }
+ }
+
+ }
+ }
@PostMapping("/addPlOrderAndDetail")
@ApiOperation(value = "浣撴鎵归噺绛惧埌鐧昏鎺ュ彛")
@Transactional //(鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�)
- public AjaxResult addPlOrderAndDetail(@RequestBody List<String> cusIds){
- SysUser sysUser = UserHoder.getLoginUser().getUser();
- if(null !=cusIds && cusIds.size()>0){
-
+ public AjaxResult addPlOrderAndDetail(@RequestBody QianDaoDto daoDto, HttpServletResponse response) {
+ SysUser sysUser = UserHoder.getLoginUser().getUser();
+ List<String> cusIds = daoDto.getCusIds();
+ ArrayList<String> tjNumbers = new ArrayList<>();
+ if (null != cusIds && !cusIds.isEmpty()) {
ExecutorService threadPools = Executors.newFixedThreadPool(cusIds.size());
for (String cusId : cusIds) {
threadPools.execute(new Runnable() {
@@ -1029,24 +1344,81 @@
});
}
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
- wq.in(TjCustomer::getCusIdcard,cusIds);
+ wq.in(TjCustomer::getCusIdcard, cusIds);
List<Long> list = tjCustomerService.list(wq).stream().map(TjCustomer::getCusId).collect(Collectors.toList());
- if(list.size()>0){
- ExecutorService threadPool = Executors.newFixedThreadPool(list.size());
+ if (!list.isEmpty()) {
+// ExecutorService threadPool = Executors.newFixedThreadPool(list.size());
+ ThreadPoolTaskExecutor executor = threadPoolConfig.threadPoolTaskExecutor();
for (Long aLong : list) {
- threadPool.execute(new Runnable() {
+// threadPool.execute(new Runnable() {
+// @Override
+// public void run() {
+// try {
+// AjaxResult result = getAjaxResult(aLong, sysUser, daoDto.getTjCategory());
+// threadPool.shutdown();
+// } catch (IOException e) {
+// e.printStackTrace();
+// }
+// }
+// });
+ Future<AjaxResult> future = executor.submit(new Callable<AjaxResult>() {
@Override
- public void run() {
- try {
- getAjaxResult(aLong,sysUser);
- threadPool.shutdown();
- } catch (IOException e) {
- e.printStackTrace();
- }
+ public AjaxResult call() throws Exception {
+ return getAjaxResult(aLong, sysUser, daoDto.getTjCategory());
}
});
+ try {
+ AjaxResult result = future.get();
+ String tjNumber = result.get("tjNumber").toString();
+ tjNumbers.add(tjNumber);
+ } catch (InterruptedException | ExecutionException e) {
+ e.printStackTrace();
+ }
+ }
+ threadPools.shutdown();
+ }
+ }
+ // TODO 鍥犱负鏈変綋妫�鍙蜂細鏌ュ嚭绌烘暟鎹� 鍏堜娇鐢ㄦ鏁版嵁
+ tjNumbers = new ArrayList<>();
+ tjNumbers.add("02095240229171627");
+ tjNumbers.add("02095240229173104");
+ tjNumbers.add("10001240524172002");
+ tjNumbers.add("10001240304124410");
+ tjNumbers.add("00325240304160123");
+ tjNumbers.add("02095240304162044");
+ tjNumbers.add("02095240304162152");
+ tjNumbers.add("10001240304163505");
+ Map<String, Object> map = null;
+ try {
+ map = PDFDocumentUtil.getDocument();
+ Document document = (Document) map.get("document");
+ for (int i = 0; i < tjNumbers.size(); i++) {
+ try {
+ List<Map<String, String>> djdInfos = tjOrderService.selectDjdInfo(tjNumbers.get(i));
+ Map<String, Object> userInfo = tjOrderService.selectDjdUserInfo(tjNumbers.get(i));
+ LocalDateTime tjsj = (LocalDateTime) userInfo.get("tjsj");
+ DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+ String time = null;
+ if (tjsj != null) {
+ time = dateFormat.format(tjsj);
+ }
+ PDFDocumentUtil.makeUserInfoTable(document, (String) userInfo.get("tjname"), (String) userInfo.get("sex")
+ , (String) userInfo.get("tjh"), (String) userInfo.get("lxdh"), (String) userInfo.get("tjname"), time);
+ PDFDocumentUtil.makeTjInfo(document, djdInfos);
+ // 澶氭潯鍒欐崲椤�
+ if (i + 1 < tjNumbers.size()) {
+ document.newPage();
+ }
+ } catch (DocumentException | IOException e) {
+ e.printStackTrace();
}
}
+ document.close();
+ ByteArrayOutputStream outputStream = (ByteArrayOutputStream) map.get("stream");
+ String encodeToString = java.util.Base64.getEncoder().encodeToString(outputStream.toByteArray());
+ return AjaxResult.success().put("file", encodeToString);
+ } catch (IOException | DocumentException e) {
+ e.printStackTrace();
}
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
@@ -1055,27 +1427,27 @@
if (!"".equals(cusIdcard) && cusIdcard != null) {
//鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
- if ("Y".equals(getInfoFromSqlData)){
+ if ("Y".equals(getInfoFromSqlData)) {
//鏍规嵁韬唤璇佸彿浠巋is鏌ヤ俊鎭�
LtkjTjPat tjPatByIdCard = testMapper.getTjPatByIdCard(cusIdcard);
- if(null != tjPatByIdCard){
+ if (null != tjPatByIdCard) {
String fcardNo = tjPatByIdCard.getFcardNo();
- if(null !=fcardNo && !fcardNo.equals("")){
- fcardNo=fcardNo.trim();
+ if (null != fcardNo && !fcardNo.equals("")) {
+ fcardNo = fcardNo.trim();
tjPatByIdCard.setFcardNo(fcardNo);
- }else {
- fcardNo=cusIdcard.trim();
+ } else {
+ fcardNo = cusIdcard.trim();
tjPatByIdCard.setFcardNo(fcardNo);
}
//鏍规嵁韬唤璇佸彿浠庢暟鎹簱鎷夸俊鎭� 娌℃湁鐨勮瘽淇濆瓨
LtkjTjPat ltkjTjPat = tjvLtkjvtjpatService.getLtkjTjPatByCusIdCard(cusIdcard);
- if(null==ltkjTjPat){
+ if (null == ltkjTjPat) {
tjvLtkjvtjpatService.save(tjPatByIdCard);
}
DynamicDataSourceContextHolder.clearDataSourceType();
//鍐嶆牴鎹韩浠借瘉鍙峰啓customer琛�
TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(tjPatByIdCard.getFcardNo());
- if(null == tjCustomer){
+ if (null == tjCustomer) {
//涓虹┖鐨勮瘽鎺夊瓨鍌ㄨ繃绋嬩繚瀛樺埌瀹㈡埛琛�
testMapper.getTjPatByCusId(cusIdcard);
LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
@@ -1083,11 +1455,11 @@
TjCustomer customer = tjCustomerService.getOne(qw);
customer.setReservationId(customer.getCardId());
extracteds(customer);
- }else {
+ } else {
String cardId = tjPatByIdCard.getFcardId();
- if(null !=cardId && !cardId.equals("0")){
+ if (null != cardId && !cardId.equals("0")) {
int i = tjOrderService.selectTjOrderByCardId(cardId);
- if(i>0){
+ if (i > 0) {
// return AjaxResult.error("涓嶅彲閲嶅绛惧埌");
}
}
@@ -1105,14 +1477,14 @@
wq.eq(TjReservation::getIsExpire, 2);
TjReservation tjReservation = tjReservationService.getOne(wq);
if (tjReservation != null) {
- if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
+/* if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
// return AjaxResult.error("鏈埌棰勭害鏃堕棿");
}
if (null != tjReservation.getReservationTime() && DateUtil.endOfDay(tjReservation.getReservationTime()).before(new Date())) {
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
// return AjaxResult.error("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�");
- }
+ }*/
LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
qw.eq(TjCustomer::getCusIdcard, cusIdcard);
TjCustomer tjCustomer1 = tjCustomerService.getOne(qw);
@@ -1131,56 +1503,50 @@
tjCustomer1.setAgeUnit(tjReservation.getAgeUnit());
tjCustomer1.setCareer(tjReservation.getCareer());
tjCustomerService.updateById(tjCustomer1);
+ } else {
+ TjCustomer tjCustomer = new TjCustomer();
+ tjCustomer.setCusIdcard(tjReservation.getIdCard());
+ tjCustomer.setCusName(tjReservation.getName());
+ tjCustomer.setCusSex(Long.valueOf(tjReservation.getSex()));
+ tjCustomer.setCusBrithday(tjReservation.getBirthday());
+ tjCustomer.setCusPhone(tjReservation.getPhoe());
+ tjCustomer.setCusEmail(tjReservation.getEmail());
+ tjCustomer.setCusAddr(tjReservation.getAddress());
+ tjCustomer.setCusMarryStatus(String.valueOf(tjReservation.getMarriage()));
+ tjCustomer.setCusNational(String.valueOf(tjReservation.getNation()));
+ tjCustomer.setIdType(tjReservation.getIdType());
+ tjCustomer.setAge(tjReservation.getAge());
+ tjCustomer.setAgeUnit(tjReservation.getAgeUnit());
+ tjCustomer.setCareer(tjReservation.getCareer());
+ tjCustomer.setDwPhone(tjReservation.getDwPhone());
+ tjCustomer.setCardId(tjReservation.getCardId());
+ tjCustomer.setIndexCard(tjReservation.getIndexCard());
+ //鎴彇瀵嗙爜鑷姩鐢熸垚set杩涘幓
+ String substring = cusIdcard.substring(cusIdcard.length() - 6);
+ substring = DigestUtils.md5DigestAsHex(substring.getBytes());
+ tjCustomer.setCusPassword(substring);
+ tjCustomer.setTjType(tjReservation.getTjType());
+ tjCustomerService.save(tjCustomer);
}
- TjCustomer tjCustomer = new TjCustomer();
- tjCustomer.setCusIdcard(tjReservation.getIdCard());
- tjCustomer.setCusName(tjReservation.getName());
- tjCustomer.setCusSex(Long.valueOf(tjReservation.getSex()));
- tjCustomer.setCusBrithday(tjReservation.getBirthday());
- tjCustomer.setCusPhone(tjReservation.getPhoe());
- tjCustomer.setCusEmail(tjReservation.getEmail());
- tjCustomer.setCusAddr(tjReservation.getAddress());
- tjCustomer.setCusMarryStatus(String.valueOf(tjReservation.getMarriage()));
- tjCustomer.setCusNational(String.valueOf(tjReservation.getNation()));
-
- tjCustomer.setIdType(tjReservation.getIdType());
- tjCustomer.setAge(tjReservation.getAge());
- tjCustomer.setAgeUnit(tjReservation.getAgeUnit());
- tjCustomer.setCareer(tjReservation.getCareer());
- tjCustomer.setDwPhone(tjReservation.getDwPhone());
- tjCustomer.setCardId(tjReservation.getCardId());
- tjCustomer.setIndexCard(tjReservation.getIndexCard());
-
- //鎴彇瀵嗙爜鑷姩鐢熸垚set杩涘幓
- String substring = cusIdcard.substring(cusIdcard.length() - 6);
- substring = DigestUtils.md5DigestAsHex(substring.getBytes());
- tjCustomer.setCusPassword(substring);
- tjCustomer.setTjType(tjReservation.getTjType());
- tjCustomerService.save(tjCustomer);
-// return success(tjCustomer);
}
-// LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
-// qw.eq(TjCustomer::getCusIdcard, cusIdcard);
-// TjCustomer tjCustomer = tjCustomerService.getOne(qw);
-// return AjaxResult.success("鏆傛棤棰勭害淇℃伅",tjCustomer);
+
}
-// return error("韬唤璇佸彿涓嶅瓨鍦�");
}
private void extracteds(TjCustomer customer) {
//浠巋is琛ㄦ姄鏁版嵁
LtkjMiddleHead pat = testMapper.getMiddleHeadByPartId(customer.getCardId());
if (null != pat) {
- LambdaQueryWrapper<LtkjMiddleHead> wq1=new LambdaQueryWrapper<>();
- wq1.eq(LtkjMiddleHead::getFeadId,customer.getCardId());
+ LambdaQueryWrapper<LtkjMiddleHead> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(LtkjMiddleHead::getFeadId, customer.getCardId());
headService.remove(wq1);
- LambdaQueryWrapper<LtkjMiddleDetail> wq0=new LambdaQueryWrapper<>();
- wq0.eq(LtkjMiddleDetail::getFheadId,pat.getFeadId());
+ LambdaQueryWrapper<LtkjMiddleDetail> wq0 = new LambdaQueryWrapper<>();
+ wq0.eq(LtkjMiddleDetail::getFheadId, pat.getFeadId());
middleDetailService.remove(wq0);
List<LtkjMiddleDetail> list = testMapper.getMiddleDetailByFeadId(pat.getFeadId());
DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
LtkjMiddleHead o = headService.getMiddleHeadByPartId(customer.getCardId());
- if(o==null){
+ if (o == null) {
headService.save(pat);
for (LtkjMiddleDetail ltkjMiddleDetail : list) {
middleDetailService.save(ltkjMiddleDetail);
@@ -1191,15 +1557,15 @@
DynamicDataSourceContextHolder.clearDataSourceType();
}
- private AjaxResult getAjaxResult(Long userId,SysUser sysUser) throws IOException {
+ private AjaxResult getAjaxResult(Long userId, SysUser sysUser, String tjCategory) throws IOException {
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
- wq.eq(TjCustomer::getCusId,userId);
+ wq.eq(TjCustomer::getCusId, userId);
TjCustomer tjCustomer = tjCustomerService.getOne(wq);
if (tjCustomer == null) return AjaxResult.error("璇ュ鎴锋湭鐧昏鎴栦笉瀛樺湪");
LambdaQueryWrapper<TjOrder> wqq = new LambdaQueryWrapper<>();
- wqq.eq(TjOrder::getUserId,userId);
+ wqq.eq(TjOrder::getUserId, userId);
wqq.eq(TjOrder::getCheckStatus, 0);
wqq.isNull(TjOrder::getFinishTime);
if (!tjCustomer.getCardId().equals("0")) {
@@ -1210,14 +1576,21 @@
transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjCustomer.getCardId());
return AjaxResult.error("涓嶅彲閲嶅鐧昏");
}
- TjOrder tjOrder=new TjOrder();
+ TjOrder tjOrder = new TjOrder();
+ Date date = new Date();
+ tjOrder.setCreateTime(date);
+ tjOrder.setUpdateTime(date);
+ tjOrder.setCreateBy(sysUser.getNickName());
+ tjOrder.setUpdateBy(sysUser.getNickName());
tjOrder.setUserId(userId);
+ tjOrder.setTjCategory(tjCategory);
LambdaQueryWrapper<TjReservation> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjReservation::getIdCard, tjCustomer.getCusIdcard());
wq1.eq(TjReservation::getIsExpire, 2);
TjReservation tjReservation = tjReservationService.getOne(wq1);
MallOrder mallOrder = null;
if (tjReservation != null) {
+ tjOrder.setReservationId(tjReservation.getId());
mallOrder = mallOrderService.getOne(new LambdaQueryWrapper<MallOrder>().eq(MallOrder::getReservationId, tjReservation.getId()));
if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
return AjaxResult.error("鏈埌棰勭害鏃堕棿");
@@ -1239,149 +1612,110 @@
}
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
- if (null != tjReservation.getTeamNo()) {
- tjOrder.setTjType("1");
- } else {
- tjOrder.setTjType("2");
- }
- }
- //鐢熸垚浣撴鍙�
- String tjNumber = (sysUser.getUserName() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
- tjOrder.setTjNumber(tjNumber);
- if (null != tjOrder.getPhoto()) {
- File file = new File(tjOrder.getPhoto());
- if (file.isFile()) {
- FileInputStream fileInputStream = new FileInputStream(file);
- byte[] bytes = new byte[fileInputStream.available()];
- fileInputStream.read(bytes); // 璇诲彇鍒� byte 閲岄潰
- fileInputStream.close();
- // 寰楀埌鏂囦欢 涔嬪悗杞垚beye 鐒跺悗浣跨敤base64杞爜
- String encode = Base64.encode(bytes);
- tjOrder.setPhoto(encode);
- }
- }
- if (tjOrder.getFirmId() == null) {
- tjOrder.setFirmId("0");
- }
- if (null == tjOrder.getPacId() && null != transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId()))) {
- tjOrder.setPacId(transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId())));
- }
- //鍒ゆ柇灏忕▼搴忎笂棰勭害鏄惁浠橀挶
- if (null != mallOrder) tjOrder.setMallOrderId(String.valueOf(mallOrder.getId()));
- tjOrder.setStatus(TjConstants.TJ_BEGIN);
- tjOrder.setCardId(tjCustomer.getCardId());
- if (tjOrderService.save(tjOrder)) {
- //淇濆瓨鏀惰揣鍦板潃
- if ("2".equals(tjOrder.getGetType())) {
- final TjReportGetAddress address = tjOrder.getAddAddress();
- if (address != null) {
- address.setTjNumber(tjNumber);
- tjReportGetAddressService.save(address);
+
+ //鐢熸垚浣撴鍙�
+ String tjNumber = (sysUser.getUserName() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
+
+ tjNumber = tjNumber.replaceAll(".{4}$", userId.toString().substring(userId.toString().length() - 4));
+
+ tjOrder.setTjNumber(tjNumber);
+ if (null != tjOrder.getPhoto()) {
+ File file = new File(tjOrder.getPhoto());
+ if (file.isFile()) {
+ FileInputStream fileInputStream = new FileInputStream(file);
+ byte[] bytes = new byte[fileInputStream.available()];
+ fileInputStream.read(bytes); // 璇诲彇鍒� byte 閲岄潰
+ fileInputStream.close();
+ // 寰楀埌鏂囦欢 涔嬪悗杞垚beye 鐒跺悗浣跨敤base64杞爜
+ String encode = Base64.encode(bytes);
+ tjOrder.setPhoto(encode);
}
}
- Long cusNumber = tjCustomer.getCusNumber();
- cusNumber += 1;
- tjCustomer.setCusNumber(cusNumber);
-// BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount())).divide(BigDecimal.valueOf(10));
- TjFlowingWater tjFlowingWater = new TjFlowingWater();
- tjFlowingWater.setPayStasus(0L);
- if ("1".equals(tjOrder.getTjType())) {
- if (null != tjReservation && tjReservation.getPayType() == 1) {
- tjFlowingWater.setPayStasus(3L);
- }
+ if (tjOrder.getFirmId() == null) {
+ tjOrder.setFirmId("0");
}
-
- //璋冪敤SQL server鎷垮彇鏀惰垂鎯呭喌
- //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
- String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
- String isPay = configService.selectConfigByKey("isPay");
- if ("Y".equals(getInfoFromSqlData)) {
- LtkjMiddleHead middleHead = headService.getMiddleHeadByPartId(tjCustomer.getCardId());
- if (null != middleHead) {
- tjFlowingWater.setPayStasus(1L);
- }
+ if (null == tjOrder.getPacId() && null != transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId()))) {
+ tjOrder.setPacId(transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId())));
}
- tjFlowingWater.setOrderId(tjOrder.getOrderId());
- Date date1 = new Date(System.currentTimeMillis());
- String s1 = sysUser.getUserName() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1);
- tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "").toUpperCase() + s1);
+ //鍒ゆ柇灏忕▼搴忎笂棰勭害鏄惁浠橀挶
+ if (null != mallOrder) tjOrder.setMallOrderId(String.valueOf(mallOrder.getId()));
+ tjOrder.setStatus(TjConstants.TJ_BEGIN);
+ tjOrder.setCardId(tjCustomer.getCardId());
+ tjOrder.setTjType("1");
+ if (tjOrderService.save(tjOrder)) {
-// tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
-// tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
-// tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
-
- if (isPay.equals("true")) {
- if (null != mallOrder) {
- if (mallOrder.getOrderStatus().equals(201L)) {
- tjFlowingWater.setCopeWith(mallOrder.getActualPrice());
- tjFlowingWater.setPaidIn(mallOrder.getActualPrice());
- tjFlowingWater.setDiscount(String.valueOf(1));
- tjFlowingWater.setPayStasus(1L);
- tjFlowingWater.setPayType(3L);
- MallCheckLog checkLog = new MallCheckLog();
- checkLog.setCheckBy(sysUser.getNickName());
- checkLog.setUserId(mallOrder.getUserId());
- checkLog.setConsignee(mallOrder.getConsignee());
- checkLog.setIdCard(mallOrder.getIdCard());
- checkLog.setOrderId(String.valueOf(mallOrder.getId()));
- checkLog.setOrderSn(mallOrder.getOrderSn());
- checkLog.setCheckTime(new Date());
- checkLog.setShipSn("HX" + s1);
- mallCheckLogService.save(checkLog);
- mallOrder.setOrderStatus(301L);
- mallOrderService.updateById(mallOrder);
+ //淇濆瓨鏀惰揣鍦板潃
+ if ("2".equals(tjOrder.getGetType())) {
+ final TjReportGetAddress address = tjOrder.getAddAddress();
+ if (address != null) {
+ address.setTjNumber(tjNumber);
+ tjReportGetAddressService.save(address);
}
}
- else {
-// tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
-// tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
-// tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
-// tjFlowingWater.setPayStasus(0L);
+ Long cusNumber = tjCustomer.getCusNumber();
+ cusNumber += 1;
+ tjCustomer.setCusNumber(cusNumber);
+// BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount())).divide(BigDecimal.valueOf(10));
+ TjFlowingWater tjFlowingWater = new TjFlowingWater();
+ tjFlowingWater.setPayStasus(0L);
+ if ("1".equals(tjOrder.getTjType())) {
+ if (tjReservation.getPayType() == 1) {
+ tjFlowingWater.setPayStasus(3L);
+ }
}
- }
- if (tjFlowingWaterService.save(tjFlowingWater)) {
- tjOrder.setTjSerialNumber(String.valueOf(tjFlowingWater.getTjSerialNumber()));
- tjOrderService.updateById(tjOrder);
+
+ //璋冪敤SQL server鎷垮彇鏀惰垂鎯呭喌
+ //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
+ String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
+ String isPay = configService.selectConfigByKey("isPay");
+ if ("Y".equals(getInfoFromSqlData)) {
+ LtkjMiddleHead middleHead = headService.getMiddleHeadByPartId(tjCustomer.getCardId());
+ if (null != middleHead) {
+ tjFlowingWater.setPayStasus(1L);
+ }
+ }
+ tjFlowingWater.setOrderId(tjOrder.getOrderId());
+ Date date1 = new Date(System.currentTimeMillis());
+ String s1 = sysUser.getUserName() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1);
+ tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "").toUpperCase() + s1);
+
+ if (isPay.equals("true")) {
+ if (null != mallOrder) {
+ if (mallOrder.getOrderStatus().equals(201L)) {
+ tjFlowingWater.setCopeWith(mallOrder.getActualPrice());
+ tjFlowingWater.setPaidIn(mallOrder.getActualPrice());
+ tjFlowingWater.setDiscount(String.valueOf(1));
+ tjFlowingWater.setPayStasus(1L);
+ tjFlowingWater.setPayType(3L);
+ MallCheckLog checkLog = new MallCheckLog();
+ checkLog.setCheckBy(sysUser.getNickName());
+ checkLog.setUserId(mallOrder.getUserId());
+ checkLog.setConsignee(mallOrder.getConsignee());
+ checkLog.setIdCard(mallOrder.getIdCard());
+ checkLog.setOrderId(String.valueOf(mallOrder.getId()));
+ checkLog.setOrderSn(mallOrder.getOrderSn());
+ checkLog.setCheckTime(new Date());
+ checkLog.setShipSn("HX" + s1);
+ mallCheckLogService.save(checkLog);
+ mallOrder.setOrderStatus(301L);
+ mallOrderService.updateById(mallOrder);
+ }
+ }
+ }
+ if (tjFlowingWaterService.save(tjFlowingWater)) {
+ tjOrder.setTjSerialNumber(String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ tjOrderService.updateById(tjOrder);
- }
-
- //鍥綋
-// if ("1".equals(tjOrder.getTjType())) {
+ }
asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
-// }
- //涓汉
-// if ("2".equals(tjOrder.getTjType())) {
-// //asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
-// newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
-// }
- //璋冪敤SQL server鎷垮彇鏀惰垂鎯呭喌
- //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
-// final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
-// if ("Y".equals(getInfoFromSqlData)){
-// List<LtkjMiddleHead> one = testMapper.saveMiddleHeadByPatId(tjCustomer.getCusIdcard());
-// if (one!=null){
-// for (LtkjMiddleHead ltkjMiddleHead : one) {
-// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
-// headService.save(ltkjMiddleHead);
-// DynamicDataSourceContextHolder.clearDataSourceType();
-// List<LtkjMiddleDetail> detailList = testMapper.getMiddleDetailByHeadId(ltkjMiddleHead.getFeadId());
-// if (detailList!=null){
-// for (LtkjMiddleDetail ltkjMiddleDetail : detailList) {
-// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
-// middleDetailService.save(ltkjMiddleDetail);
-// DynamicDataSourceContextHolder.clearDataSourceType();
-// }
-// }
-// }
-//
-// }
-// }
- tjCustomer.setCardId("0");
- tjCustomerService.updateById(tjCustomer);
- return AjaxResult.success(tjNumber);
+
+ tjCustomer.setCardId("0");
+ tjCustomerService.updateById(tjCustomer);
+ return AjaxResult.success().put("tjNumber", tjNumber);
+ }
}
return AjaxResult.error();
}
@@ -1448,7 +1782,7 @@
if (null != tjCustomer) {
cardId = tjCustomer.getCardId();
}
- if ((null == proIds || proIds.size() == 0) && (null == packId || packId.equals(""))) {
+ if ((null == proIds || proIds.isEmpty()) && (null == packId || packId.equals(""))) {
transitionService.deletedTbTransitionByCusId(cusId);
if (redisCache.hasKey(cardId + cusId)) {
redisCache.deleteObject(cardId + cusId);
@@ -1457,127 +1791,35 @@
redisCache.deleteCacheMapValue(cardId + cusId + "cusId", cardId + cusId);
}
}
- List<TbTransition> tbTransitionList = null;
- if (!redisCache.hasKey(cardId + cusId)) {
- tbTransitionList = new ArrayList<>();
- } else {
- tbTransitionList = redisCache.getCacheList(cardId + cusId);
- }
- //濂楅
+ /*濂楅*/
if (null != packId && !packId.equals("")) {
Long pacId = Long.valueOf(packId.toString());
List<TbTransition> list = transitionService.getTbTransitionListByCusIdAndPac(cusId, String.valueOf(pacId));
- if (null == list || list.size() == 0) {
+ if (null == list || list.isEmpty()) {
transitionService.deletedTbTransitionListByCusIdAndPac(cusId, cardId);
- if (redisCache.hasKey(cardId + cusId + "cusId"))
- redisCache.deleteCacheMapValue(cardId + cusId + "cusId", cardId + cusId);
- if (redisCache.hasKey(cardId + cusId)) {
- tbTransitionList = new ArrayList<>();
- redisCache.deleteObject(cardId + cusId);
- }
List<TjPackageProject> ppList = tjPackageProjectService.getTjPackageProjectListByPacId(String.valueOf(pacId));
- if (null != ppList && ppList.size() > 0) {
- //寮傛淇濆瓨鏁版嵁搴�
-// asyncService.addRedisTransitionPac(cusId, pacId, ppList);
- asyncService.saveRedisTransitionByPacId(cusId, pacId, null);
- for (TjPackageProject tjPackageProject : ppList) {
- TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId()));
- if (null != project) {
-
- BigDecimal divide = BigDecimal.valueOf(0);
- if(tjPackageProject.getPriceNow().compareTo(BigDecimal.valueOf(0))==0 || project.getProPrice().compareTo(BigDecimal.valueOf(0))==0 ){
- divide=BigDecimal.valueOf(0);
- }else {
- divide=tjPackageProject.getPriceNow().divide(project.getProPrice(), 5, RoundingMode.HALF_DOWN);
- }
- List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
- if (null != tjProSonList && tjProSonList.size() > 0) {
- //addRedisTransitionPac(cusId, tbTransitionList, pacId, tjPackageProject, project, divide, tjProSonList);
- for (TjProject tjProject : tjProSonList) {
- TbTransition tbTransition = new TbTransition();
- tbTransition.setCusId(cusId);
- tbTransition.setPacId(pacId);
- if (null != tjPackageProject.getPriceNow() && divide.compareTo(BigDecimal.valueOf(0)) > 0) {
- tbTransition.setNowPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
- tbTransition.setOrdPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
- } else {
- tbTransition.setNowPrice(BigDecimal.valueOf(0.00));
- tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
- }
- tbTransition.setParentProId(project.getProId());
- tbTransition.setParentProName(project.getProName());
- tbTransition.setProId(tjProject.getProId());
- tbTransition.setProName(tjProject.getProName());
- tbTransition.setPacName(tjPackageService.getById(tbTransition.getPacId()).getPacName());
- tbTransition.setProType(tjProject.getProType());
- tbTransition.setProCheckMethod(tjProject.getProCheckMethod());
- tbTransitionList.add(tbTransition);
- }
-
- }
- }
+ if (null != ppList && !ppList.isEmpty()) {
+ String string = transitionService.panduantaocanshifouchongfu(cusId, pacId);
+ if (!StringUtils.isBlank(string)) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎿嶄綔澶辫触! 浠ヤ笅椤圭洰宸插瓨鍦�: " + string);
}
+ transitionService.saveRedisTransitionByPacId(cusId, cardId, pacId);
}
}
}
//鍗曢」
- if (null != proIds && proIds.size() > 0) {
+ if (null != proIds && !proIds.isEmpty()) {
//寮傛淇濆瓨鏁版嵁搴撹〃
- asyncService.saveRedisTransitionByPacId(cusId, null, proIds);
for (Long proId : proIds) {
- List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
- if (null != transitions && transitions.size() > 0) {
- continue;
- }
- TjProject tjProject = projectService.getTjProjectById(String.valueOf(proId));
- if (null != tjProject) {
-// List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
-// if (null != tjProSonList && tjProSonList.size() > 0) {
-// for (TjProject tjProject : tjProSonList) {
-// List<TbTransition> transitionss = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(tjProject.getProId()));
-// if (null != transitionss && transitionss.size() > 0) {
-// continue;
-// }
- TbTransition tbTransition = new TbTransition();
- tbTransition.setCusId(cusId);
- tbTransition.setPacId(null);
- if (null != tjProject.getProPrice()) {
- tbTransition.setOrdPrice(tjProject.getProPrice());
- tbTransition.setNowPrice(tjProject.getProPrice());
- } else {
- tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
- tbTransition.setNowPrice(BigDecimal.valueOf(0.00));
+ TjProject project = projectService.selectTjProjectByProId(proId);
+ if (null != project) {
+ List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
+ if (null == transitionList || transitionList.isEmpty()) {
+ transitionService.saveRedisTransitionByProId(cusId, cardId, proId);
}
- tbTransition.setParentProId(tjProject.getProParentId());
- if (tjProject.getProParentId() != null) {
- TjProject byId = projectService.getById(tjProject.getProParentId());
- if (null != byId) {
- tbTransition.setParentProName(byId.getProName());
- }
- }
- tbTransition.setParentProName("");
-
- tbTransition.setProId(tjProject.getProId());
- tbTransition.setProName(tjProject.getProName());
- tbTransition.setProType(tjProject.getProType());
- tbTransition.setProCheckMethod(tjProject.getProCheckMethod());
- tbTransitionList.add(tbTransition);
-// }
-// }
}
- }
- }
-
-
- if (null != tbTransitionList && tbTransitionList.size() > 0) {
- if (redisCache.hasKey(cardId + cusId)) {
- redisCache.deleteObject(cardId + cusId);
- redisCache.setCacheList(cardId + cusId, tbTransitionList);
- redisCache.setCacheMapValue(cardId + cusId + "cusId", cardId + cusId, getMaps(cusId, cardId));
- } else {
- redisCache.setCacheList(cardId + cusId, tbTransitionList);
- redisCache.setCacheMapValue(cardId + cusId + "cusId", cardId + cusId, getMaps(cusId, cardId));
}
}
return AjaxResult.success();
@@ -1632,7 +1874,7 @@
for (TjOrder order : list) {
TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
if (null != tjCustomer) {
- order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+ order.setTjCustomerName(tjCustomer.getCusName());
order.setTjCustomerSex(tjCustomer.getCusSex());
order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
@@ -1686,7 +1928,7 @@
for (TjOrder order : list) {
TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
if (null != tjCustomer) {
- order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+ order.setTjCustomerName(tjCustomer.getCusName());
order.setTjCustomerSex(tjCustomer.getCusSex());
order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
@@ -1748,6 +1990,7 @@
*/
@PostMapping("/tjGoOut")
@ApiOperation(value = "浣撴绛剧")
+ @Transactional
public AjaxResult tjGoOut(@RequestBody Map<String, Object> map) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
@@ -1755,6 +1998,7 @@
String jsonString = com.alibaba.fastjson.JSON.toJSONString(domainVos1);
List<QjDomainVo> domainVos = com.alibaba.fastjson.JSON.parseArray(jsonString, QjDomainVo.class);
String tjNumber = map.get("tjNumber").toString();
+ TjOrder tjOrder = tjOrderService.getOrderByTjNum(tjNumber);
if (null != domainVos && domainVos.size() > 0) {
Set<String> list = new HashSet<>();
for (QjDomainVo domainVo : domainVos) {
@@ -1768,7 +2012,6 @@
if (domainVo.getType() == 3) {
list.add(String.valueOf(domainVo.getTjNumber()));
} else {
- TjOrder tjOrder = tjOrderService.getOrderByTjNum(remark.getTjNumber());
if (null != tjOrder) {
tjOrder.setFinishTime(new Date());
tjOrder.setStatus(TjConstants.TJ_CONFIRM);
@@ -1777,9 +2020,44 @@
}
}
}
+ remarkService.updateRemark(tjNumber);
asyncService.tjGoutAsync(domainVos, sysUser, list);
+
+ TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
+ customer.setCardId("0");
+ tjCustomerService.updateById(customer);
+ /* String config = configService.selectConfigByKey("sfkqdyhis");
+ if(null !=config && config.equals("Y")){
+ final String date = DateUtil.format(tjOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss");
+ OutpinimpapplyDto dto=new OutpinimpapplyDto();
+ dto.setHisRegistrationId(tjOrder.getCardId());
+ dto.setMzzdid(1);
+ dto.setSqysbm("00029");
+ dto.setMzksbm("0101");
+ dto.setFbrq(date);
+ dto.setZdrq(date);
+ dto.setCzybm("00029");
+ dto.setCzyksbm("0101");
+ dto.setZs("鍋ュ悍鏌ヤ綋");
+ dto.setBs("涓嶈");
+ dto.setClyz("");
+ dto.setJws("");
+ dto.setTgjc("");
+ dto.setGms("");
+ dto.setJbbm("Z00.001");
+ dto.setJbbm1("");
+ dto.setJbbm2("");
+ dto.setFzbz("1");
+ dto.setHzqx("6");
+ dto.setSfqc("0");
+ dto.setQchs("");
+ dto.setSfqj("0");
+ dto.setJzqk(9);
+ controller.Outpinimpapply(dto);
+ }*/
return AjaxResult.success("绛剧鎴愬姛锛�");
} else {
+ remarkService.updateRemark(tjNumber);
return getAjaxResult(tjNumber);
}
}
@@ -1790,6 +2068,7 @@
*/
@GetMapping("/goOut")
@ApiOperation(value = "绛剧")
+ @Transactional
public AjaxResult goOut(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) {
return getAjaxResult(tjNumber);
}
@@ -1840,7 +2119,7 @@
// if (redisCache.hasKey(cardId + cusId)) {
// transitionList = redisCache.getCacheList(cardId + cusId);
// } else {
- transitionList = transitionService.getTbTransitionListByCusId(cusId, cardId);
+ transitionList = transitionService.getTbTransitionListByCusId(cusId, cardId);
// }
if (null == transitionList) return null;
Map<Long, List<TbTransition>> collect = transitionList.stream().collect(Collectors.groupingBy(TbTransition::getParentProId));
@@ -1848,8 +2127,10 @@
for (Map.Entry<Long, List<TbTransition>> entry : collect.entrySet()) {
Map<String, Object> map = new HashMap<>();
Long pacId = entry.getValue().get(0).getPacId();
+ map.put("proPrantId", entry.getKey().toString());
if (null != pacId) {
TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
+ map.put("tjCategory", aPackage.getTjCategory());
map.put("pacName", aPackage.getPacName());
TjProject tjProject = projectService.getById(entry.getKey());
// TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
@@ -1860,8 +2141,61 @@
// } else {
// map.put("nowPrice", tjProject.getProPrice());
// }
- map.put("nowPrice",transitionService.getTbTransitionDxPriceByPac(cusId,entry.getKey(),cardId,pacId));
+ map.put("nowPrice", transitionService.getTbTransitionDxPriceByPac(cusId, entry.getKey(), cardId, pacId));
} else {
+ map.put("tjCategory", null);
+ map.put("pacName", "鍗曢」");
+ List<TbTransition> tbTransitionList = entry.getValue();
+ if (null != tbTransitionList && tbTransitionList.size() > 0) {
+ BigDecimal money1 = new BigDecimal("0.00");
+ BigDecimal money2 = new BigDecimal("0.00");
+ for (TbTransition tbTransition : tbTransitionList) {
+ money1 = money1.add(tbTransition.getOrdPrice());
+ money2 = money2.add(tbTransition.getNowPrice());
+ }
+ map.put("ordPrice", money1);
+ map.put("nowPrice", money2);
+ }
+ }
+ map.put("parentName", projectService.getById(entry.getKey()).getProName());
+ map.put("list", entry.getValue());
+ list.add(map);
+ }
+ return list;
+ }
+
+
+ private List<Map<String, Object>> getMap(String cusId, String cardId, List<TbTransition> transitionList) {
+
+// List<TbTransition> transitionList = null;
+// if (redisCache.hasKey(cardId + cusId)) {
+// transitionList = redisCache.getCacheList(cardId + cusId);
+// } else {
+// transitionList = transitionService.getTbTransitionListByCusId(cusId, cardId);
+// }
+ if (null == transitionList) return null;
+ Map<Long, List<TbTransition>> collect = transitionList.stream().collect(Collectors.groupingBy(TbTransition::getParentProId));
+ List<Map<String, Object>> list = new ArrayList<>();
+ for (Map.Entry<Long, List<TbTransition>> entry : collect.entrySet()) {
+ Map<String, Object> map = new HashMap<>();
+ Long pacId = entry.getValue().get(0).getPacId();
+ map.put("proPrantId", entry.getKey().toString());
+ if (null != pacId) {
+ TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
+ map.put("tjCategory", aPackage.getTjCategory());
+ map.put("pacName", aPackage.getPacName());
+ TjProject tjProject = projectService.getById(entry.getKey());
+// TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
+// .eq(TjPackageProject::getProId, entry.getKey()));
+ map.put("ordPrice", tjProject.getProPrice());
+// if (null != project) {
+// map.put("nowPrice", project.getPriceNow());
+// } else {
+// map.put("nowPrice", tjProject.getProPrice());
+// }
+ map.put("nowPrice", tjProject.getProPrice());
+ } else {
+ map.put("tjCategory", null);
map.put("pacName", "鍗曢」");
List<TbTransition> tbTransitionList = entry.getValue();
if (null != tbTransitionList && tbTransitionList.size() > 0) {
@@ -1886,13 +2220,17 @@
LambdaQueryWrapper<TjOrder> wq0 = new LambdaQueryWrapper<>();
wq0.eq(TjOrder::getTjNumber, tjNumber);
TjOrder tjOrder = tjOrderService.getOne(wq0);
+
if (null != tjOrder) {
+ TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
+ customer.setCardId("0");
+ tjCustomerService.updateById(customer);
+
LambdaQueryWrapper<TjOrderDetail> wq11 = new LambdaQueryWrapper<>();
wq11.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
wq11.eq(TjOrderDetail::getTjStatus, 0);
wq11.isNotNull(TjOrderDetail::getFlowingWaterId);
List<TjOrderDetail> list = tjOrderDetailService.list(wq11);
-
if (list != null) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
@@ -2093,14 +2431,85 @@
return AjaxResult.success(transitionService.remove(wq));
}
+ @GetMapping("/getTransitionInfo")
+ @ApiOperation(value = "鏍规嵁浣撴鍙疯幏鍙栨眹鎬诲拰鏄庣粏鐨勬暟鎹�")
+ public AjaxResult getTransitionInfo(@RequestParam("tjNumber") String tjNumber) {
+ QueryWrapper<TbTransition> wrapper = new QueryWrapper<>();
+ wrapper.select("parent_pro_id", "parent_pro_name", "sum(ord_price) as ord_price")
+ .eq("tj_num", tjNumber)
+ .groupBy("parent_pro_name");
+ List<TbTransition> list = transitionService.list(wrapper);
+ List<Long> parentProIds = list.stream().map(item -> item.getParentProId()).collect(Collectors.toList());
+ LambdaQueryWrapper<TjProject> projectQueryWrapper = new LambdaQueryWrapper<>();
+ projectQueryWrapper.in(TjProject::getProId, parentProIds);
+ List<TjProject> projects = projectService.list(projectQueryWrapper);
+ JSONArray huiZong = JSONUtil.createArray();
+ int index = 1;
+ for (TjProject project : projects) {
+ LambdaQueryWrapper<SysDept> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(SysDept::getDeptId, project.getDeptId());
+ SysDept dept = sysDeptService.getOne(queryWrapper);
+ for (TbTransition tbTransition : list) {
+ if (tbTransition.getParentProId().toString().equals(project.getProId().toString())) {
+ JSONObject obj = JSONUtil.createObj();
+ obj.putOpt("index", index++);
+ obj.putOpt("parent_pro_name", tbTransition.getParentProName());
+ obj.putOpt("price", tbTransition.getOrdPrice());
+ obj.putOpt("ks", dept.getDeptName());
+ huiZong.add(obj);
+ }
+ }
+ }
+ wrapper = new QueryWrapper<>();
+ wrapper.eq("tj_num", tjNumber);
+ list = transitionService.list(wrapper);
+ JSONArray info = JSONUtil.createArray();
+ index = 1;
+ for (TbTransition tbTransition : list) {
+ JSONObject obj = JSONUtil.createObj();
+ obj.putOpt("index", index++);
+ obj.putOpt("parent_pro_name", tbTransition.getParentProName());
+ obj.putOpt("pro_name", tbTransition.getProName());
+ BigDecimal ordPrice = tbTransition.getOrdPrice();
+ obj.putOpt("zongjia", ordPrice);
+ QueryWrapper<TjProject> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("pro_id", tbTransition.getProId());
+ TjProject tjProject = projectService.getOne(queryWrapper);
+ Integer num = tjProject.getSl();
+ obj.putOpt("num", num);
+ BigDecimal price = ordPrice.divide(new BigDecimal(num));
+ obj.putOpt("danjia", price);
+ Date createTime = tbTransition.getCreateTime();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ obj.putOpt("time", dateFormat.format(createTime));
+ info.put(obj);
+ }
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("huizong", huiZong);
+ map.put("info", info);
+ return AjaxResult.success().put("data", map);
+ }
+
+
public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
- tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
- tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
- //淇敼姣忛」鐨勫師浠风幇浠� //淇敼涓存椂琛ㄤ綋妫�鍙�
- transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
+ if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
+ tjOrderDetailService.saveJSYTjOrderDetailsByCusId(tjCustomer.getCusIdcard(),
+ String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId(), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ } else {
+ tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
+ }
+
+ tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
+
//娣诲姞remark琛ㄦ暟鎹�
- remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
+ if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
+ remarkService.saveJSYTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
+
+ } else {
+ remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
+
+ }
//鍒ゆ柇鏄惁浜ら挶
if ("1".equals(tjOrder.getTjType())) {
if (null != tjReservation && tjReservation.getPayType() == 1) {
@@ -2115,27 +2524,197 @@
tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
tjFlowingWater.setPayType(4L);
tjFlowingWaterService.updateById(tjFlowingWater);
- asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser);
+// asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser);
}
-// System.out.println("杩欐浠ｇ爜鏃堕棿" + (System.currentTimeMillis() - l));
}
- @PostMapping("/heXiaoByIds/{orderIds}")
- @ApiOperation(value = "鏍告敹鎶ュ憡鈥斺�斺�斺�斺�斺�旀�绘瀹℃牳閫氳繃鍚庡彲浠ユ牳閿�锛屾牳鏀跺悗鎵嶈兘鎵撳嵃")
- @Transactional
- public AjaxResult heXiaoByIds(@PathVariable String[] orderIds) {
- for (String orderId : orderIds) {
- final TjOrder byId = tjOrderService.getById(orderId);
- byId.setHeshouStatus(1);
- byId.setHeshouDoctor(UserHoder.getLoginUser().getUserId());
- byId.setHeshouTime(new DateTime());
- final boolean b = tjOrderService.updateById(byId);
- if (!b) {
- return AjaxResult.error("鏍告敹澶辫触");
+ public void ttextracted(TjOrder tjOrder, TjCustomer tjCustomer, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
+
+ tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
+ boolean b = tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(),
+ String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
+ if (!b) {
+ List<TjGroupingPro> proList = groupingProService.list(new LambdaQueryWrapper<TjGroupingPro>().eq(TjGroupingPro::getGroupingId, tjOrder.getGroupId()));
+ if (null != proList && !proList.isEmpty()) {
+ for (TjGroupingPro groupingPro : proList) {
+ TjOrderDetail detail = new TjOrderDetail();
+ TjProject tjProject = projectService.selectTjProjectByProId(Long.valueOf(groupingPro.getProId()));
+ detail.setIsSampling(String.valueOf(tjProject.getIsSampling()));
+ detail.setOrderId(tjOrder.getOrderId());
+ detail.setProId(Long.valueOf(groupingPro.getProId()));
+ detail.setTjStatus(0L);
+ detail.setCreateBy(sysUser.getNickName());
+ detail.setCreateTime(new Date());
+ detail.setUpdateBy(sysUser.getNickName());
+ detail.setUpdateTime(new Date());
+ detail.setCreateId(String.valueOf(sysUser.getUserId()));
+ detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ tjOrderDetailService.save(detail);
+ }
+ List<String> list = proList.stream().map(TjGroupingPro::getProId).collect(Collectors.toList());
+ List<TjProject> projectList = projectService.list(new LambdaQueryWrapper<TjProject>().in(TjProject::getProParentId, list));
+ for (TjProject project : projectList) {
+ TjOrderDetail detail = new TjOrderDetail();
+ detail.setOrderId(tjOrder.getOrderId());
+ detail.setProId(project.getProId());
+ detail.setTjStatus(0L);
+ detail.setCreateBy(sysUser.getNickName());
+ detail.setCreateTime(new Date());
+ detail.setUpdateBy(sysUser.getNickName());
+ detail.setUpdateTime(new Date());
+ detail.setCreateId(String.valueOf(sysUser.getUserId()));
+ detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ //鑾峰彇璇ラ」鐩殑榛樿鍊艰祴鍊肩粰缁撴灉
+ if (null != project.getProDefault()) {
+ detail.setProResult(project.getProDefault());
+ } else {
+ detail.setProResult(null);
+ }
+ detail.setIsSampling(String.valueOf(project.getIsSampling()));
+
+ tjOrderDetailService.save(detail);
+ }
}
}
+
+ //娣诲姞remark琛ㄦ暟鎹�
+ remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
+
+ //鍒ゆ柇鏄惁浜ら挶
+ if ("1".equals(tjOrder.getTjType())) {
+ if (null != tjReservation && tjReservation.getPayType() == 1) {
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ }
+ }
+ if (tjFlowingWater.getPayStasus() == 1) {
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ }
+ if (tjFlowingWater.getDiscount() == null) {
+ transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), new BigDecimal(10), tjOrder.getTjNumber());
+ } else {
+ transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), BigDecimal.valueOf(Long.parseLong(tjFlowingWater.getDiscount())), tjOrder.getTjNumber());
+ }
+
+ tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
+// List<TjOrderDetail> list = tjOrderDetailService.getTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()));
+// if (list != null) {
+// for (TjOrderDetail tjOrderDetail : list) {
+// TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
+// if(tjProject==null){
+// continue;
+// }
+// tjOrderDetail.setProject(tjProject);
+// if (tjProject.getProParentId() == 0) {
+// TjOrderRemark tjOrderRemark = new TjOrderRemark();
+// tjOrderRemark.setProId(tjProject.getProId());
+// tjOrderRemark.setProName(tjProject.getProName());
+// tjOrderRemark.setDeptId(tjProject.getDeptId());
+// tjOrderRemark.setTjNumber(tjOrder.getTjNumber());
+// tjOrderRemark.setCreateBy(sysUser.getNickName());
+// tjOrderRemark.setCreateTime(new Date());
+// tjOrderRemark.setUpdateBy(sysUser.getNickName());
+// tjOrderRemark.setUpdateTime(new Date());
+// tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
+// tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
+// orderRemarkService.save(tjOrderRemark);
+// }
+// if ("1".equals(tjOrder.getTjType())) {
+// if (null != tjReservation && tjReservation.getPayType() == 1) {
+// tjOrderDetail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
+// }
+// }
+// if(tjFlowingWater.getPayStasus()==1){
+// tjOrderDetail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
+// }
+// tjOrderDetailService.updateById(tjOrderDetail);
+// }
+// }
+ }
+
+ @PostMapping("/heXiaoByIds")
+ @ApiOperation(value = "鏍告敹鎶ュ憡鈥斺�斺�斺�斺�斺�旀�绘瀹℃牳閫氳繃鍚庡彲浠ユ牳閿�锛屾牳鏀跺悗鎵嶈兘鎵撳嵃")
+ @Transactional
+ @RepeatSubmit
+ public AjaxResult heXiaoByIds(@RequestBody List<String> orderIds) {
+ Date date = new Date();
+ if(null !=orderIds && !orderIds.isEmpty()){
+ for (String orderId : orderIds) {
+ TjOrder byId = tjOrderService.getById(orderId);
+ if (null != byId) {
+
+ /*if (byId.getReportTime() == null) {
+ LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
+ tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
+ TjReportTemplate reportTemplate = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
+ if ("鎶ヨ〃".equals(reportTemplate.getPrint())) {
+ TjReport tjReport = new TjReport();
+ tjReport.setTjNumber(String.valueOf(byId.getTjNumber()));
+ tjReport.setPath(reportTemplate.getUrl() + "?tjNum=" + byId.getTjNumber());
+ tjReport.setType("浣撴鎶ュ憡");
+ tjReport.setPrint("鎶ヨ〃");
+ tjReportService.save(tjReport);
+ //淇敼order琛ㄤ腑鐨勬墦鍗版姤鍛婃椂闂翠负褰撳墠鏃堕棿
+ LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(TjOrder::getTjNumber, byId.getTjNumber());
+ updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
+ tjOrderService.update(updateWrapper);
+ }
+
+ LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjCustomer::getCusId, byId.getUserId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
+ LambdaQueryWrapper<TjReportTemplate> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjReportTemplate::getFlag, "4");
+ wrapper.eq(TjReportTemplate::getOpen, "1");
+ TjReportTemplate zongJianYiShiQianMing = reportTemplateService.getOne(wrapper);
+ try {
+ shengchengbgmoban(byId.getTjNumber(), byId, tjCustomer, reportTemplate, zongJianYiShiQianMing);
+ byId.setStatus(TjConstants.TJ_END);
+ } catch (Exception e) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ e.printStackTrace();
+ // 璋冪敤鎾ら攢
+ logger.error("鐢熸垚鎶ュ憡寮傚父");
+ return AjaxResult.error("鐢熸垚鎶ュ憡寮傚父,鏍告敹澶辫触");
+ }
+ }*/
+ byId.setHeshouStatus(1);
+ byId.setHeshouDoctor(UserHoder.getLoginUser().getUserId());
+ byId.setHeshouTime(date);
+ final boolean b = tjOrderService.updateById(byId);
+ if (!b) {
+ return AjaxResult.error("鏍告敹澶辫触");
+ }
+ }
+ }
+ }
return AjaxResult.success("鏍告敹鎴愬姛");
+ }
+
+
+ public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate, TjReportTemplate zongJianYiShiQianMing) throws Exception {
+
+ AjaxResult ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate, zongJianYiShiQianMing);
+ if (!ajaxResult.get("code").toString().equals("200")) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ } else {
+ Long userId = tjCustomer.getCusId();
+ String outputFileName1 = userId + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
+ TjReport tjReport = new TjReport();
+ tjReport.setTjNumber(String.valueOf(tjNumber));
+ tjReport.setPath(urlValue + outputFileName1);
+ String outputPath1 = value + File.separator;
+ String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
+ tjReport.setReport(pdfBinary);
+ tjReport.setType("浣撴鎶ュ憡");
+ tjReport.setPrint("pdf");
+ tjReportService.save(tjReport);
+ }
+ return ajaxResult;
}
@GetMapping("/getHistryTjOrderByCusIdCard")
@@ -2241,7 +2820,7 @@
final List<TjFlowingWater> list1 = tjFlowingWaterService.list(wqq);
if (list1 != null) {
for (TjFlowingWater tjFlowingWater : list1) {
- if (tjFlowingWater!=null && tjFlowingWater.getPaidIn()!=null){
+ if (tjFlowingWater != null && tjFlowingWater.getPaidIn() != null) {
res.add(tjFlowingWater.getPaidIn());
}
}
@@ -2260,21 +2839,476 @@
public AjaxResult revokeTjOrderByTjNum(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNum) {
TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
- if(null !=order){
- String payByTjNum = tjOrderService.isPayByTjNum(String.valueOf(order.getOrderId()));
- if(null!=payByTjNum){
- return AjaxResult.success("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
- }
+ if (null != order) {
+// String payByTjNum = tjOrderService.isPayByTjNum(String.valueOf(order.getOrderId()));
+// if (null != payByTjNum) {
+// return AjaxResult.error("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
+// }
+ if (null != order.getFinishTime()) return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲鎾ら攢!!!");
tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
remarkService.deletedOrderRemarkByTjNum(tjNum);
tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
transitionService.deletedTbTransitionByTjNum(tjNum);
- transitionService.updateTbTransitionByTjNum(tjNum);
- return AjaxResult.success("鎾ら攢鎴愬姛!!!");
+
+ TjCustomer customer = tjCustomerService.getById(order.getUserId());
+ customer.setCardId("0");
+ tjCustomerService.updateById(customer);
+ String configByKey = configService.selectConfigByKey("sfkqdyhis");
+ tjSamplingMapper.deleteByTjNumAndCusId(tjNum, order.getUserId());
+ if (configByKey.equals("Y")) {
+
+ HashMap<String, Object> hisRequestParams = new HashMap<>();
+ hisRequestParams.put("patientId", order.getCardId());
+ 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");
+
+ BigDecimal cateFeeAll = BigDecimal.ZERO;
+ for (Map<String, String> datum : data) {
+ BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
+ cateFeeAll = cateFeeAll.add(cateFee);
+ }
+ if (cateFeeAll.compareTo(BigDecimal.ZERO) != 0) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎾ら攢澶辫触,璇ヤ汉鍛樺凡缂磋垂,璇峰厛閫�璐�!");
+ }
+ }
+ boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order, lisApiMethod.isUseLisAndPacsRegister(order));
+ if (zfHisApiMethods) {
+ return AjaxResult.success("鎾ら攢鎴愬姛");
+ } else {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
+ }
+
+ }
}
return AjaxResult.success("绛惧埌璁板綍涓嶅瓨鍦�!");
}
+
+ @GetMapping("/getCusTomterListByCompId")
+ @ApiOperation(value = "鑾峰彇鍗曚綅id浣撴浜轰俊鎭帴鍙�")
+ public AjaxResult getCusTomterListByCompId(@RequestParam(required = false) @ApiParam(value = "鍗曚綅id") String compId,
+ @RequestParam(required = false) @ApiParam(value = "鍚嶅瓧") String name,
+ @RequestParam(required = false) @ApiParam(value = "閮ㄩ棬id") String deptId,
+ @RequestParam(required = false) @ApiParam(value = "棰勭害鏃堕棿") Date reservationTime,
+ @RequestParam(defaultValue = "1") Integer page,
+ @RequestParam(defaultValue = "10") Integer pageSize) {
+ Page<TjReservation> pages = new Page<>(page, pageSize);
+ LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
+ if (null != compId) wq.eq(TjReservation::getCompanyId, compId);
+ if (null != name) wq.eq(TjReservation::getName, name);
+ if (null != deptId) wq.eq(TjReservation::getDepartment, deptId);
+ if (null != reservationTime)
+ wq.between(TjReservation::getReservationTime, DateUtil.beginOfDay(reservationTime), DateUtil.endOfDay(reservationTime));
+ List<TjReservation> reservationList = tjReservationService.list(wq);
+ if (null != reservationList && reservationList.size() > 0) {
+ LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
+ wq1.in(TjOrder::getReservationId, reservationList.stream().map(TjReservation::getId).collect(Collectors.toList()));
+ List<TjOrder> orderList = tjOrderService.list(wq1);
+ if (null != orderList && orderList.size() > 0) {
+ LambdaQueryWrapper<TjReservation> wq3 = new LambdaQueryWrapper<>();
+ wq3.in(TjReservation::getId, orderList.stream().map(TjOrder::getReservationId).collect(Collectors.toList()));
+// wq3.eq(TjReservation::getTeamNo,reservationList.get(0).getTeamNo());
+ Page<TjReservation> page1 = tjReservationService.page(pages, wq3);
+ return AjaxResult.success(page1);
+
+ }
+ }
+ return AjaxResult.success("鏆傛棤淇℃伅");
+ }
+
+
+ @PostMapping("/plRevokeTjOrderByTjNum")
+ @ApiOperation(value = "鏍规嵁瀹㈡埛浣撴鍙锋壒閲忔挙閿�浣撴璁板綍")
+ @Transactional
+ public AjaxResult plRevokeTjOrderByTjNum(@RequestBody @ApiParam(value = "棰勭害涓婚敭id闆嗗悎") List<String> reservationIds) {
+ if (null != reservationIds && reservationIds.size() > 0) {
+ LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
+ wq1.in(TjOrder::getReservationId, reservationIds);
+ List<TjOrder> orderList = tjOrderService.list(wq1);
+ if (null != orderList && orderList.size() > 0) {
+ for (TjOrder order : orderList) {
+// TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
+ if (null != order) {
+// String payByTjNum = tjOrderService.isPayByTjNum(String.valueOf(order.getOrderId()));
+// if (null != payByTjNum) {
+// return AjaxResult.success("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
+// }
+ tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
+ tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
+ remarkService.deletedOrderRemarkByTjNum(order.getTjNumber());
+ tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
+ transitionService.deletedTbTransitionByTjNum(order.getTjNumber());
+ transitionService.updateTbTransitionByTjNum(order.getTjNumber());
+ }
+ }
+ for (String id : reservationIds) {
+ TjReservation reservation = tjReservationService.getById(id);
+ if (null != reservation) {
+ reservation.setIsExpire(2);
+ tjReservationService.updateById(reservation);
+ }
+ }
+ }
+ return AjaxResult.success("鎾ら攢鎴愬姛!!!");
+ }
+ return AjaxResult.error("璇烽�夋嫨瑕佹挙閿�鐨勪汉鍛�!");
+ }
+
+ @PostMapping("makeTjPDF")
+ @ApiOperation(value = "鎵归噺鐢熸垚PDF")
+ public AjaxResult makeTjPDF(@RequestBody List<String> reservations) {
+ QueryWrapper<TjOrder> queryWrapper = new QueryWrapper<>();
+ queryWrapper.in("reservation_id", reservations);
+ List<TjOrder> tjNumbers = tjOrderService.list(queryWrapper);
+ Map<String, Object> map = null;
+ try {
+ map = PDFDocumentUtil.getDocument();
+ Document document = (Document) map.get("document");
+ for (int i = 0; i < tjNumbers.size(); i++) {
+ String tjNumber = tjNumbers.get(i).getTjNumber();
+ try {
+ List<Map<String, String>> djdInfos = tjOrderService.selectDjdInfo(tjNumber);
+ Map<String, Object> userInfo = tjOrderService.selectDjdUserInfo(tjNumber);
+ LocalDateTime tjsj = (LocalDateTime) userInfo.get("tjsj");
+ DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+ String time = null;
+ if (tjsj != null) {
+ time = dateFormat.format(tjsj);
+ }
+ PDFDocumentUtil.makeUserInfoTable(document, (String) userInfo.get("tjname"), (String) userInfo.get("sex")
+ , (String) userInfo.get("tjh"), (String) userInfo.get("lxdh"), (String) userInfo.get("tjname"), time);
+ PDFDocumentUtil.makeTjInfo(document, djdInfos);
+ // 澶氭潯鍒欐崲椤�
+ if (i + 1 < tjNumbers.size()) {
+ document.newPage();
+ }
+ } catch (DocumentException | IOException e) {
+ e.printStackTrace();
+ }
+ }
+ document.close();
+ ByteArrayOutputStream outputStream = (ByteArrayOutputStream) map.get("stream");
+ String encodeToString = java.util.Base64.getEncoder().encodeToString(outputStream.toByteArray());
+ return AjaxResult.success().put("file", encodeToString);
+ } catch (IOException | DocumentException e) {
+ e.printStackTrace();
+ return AjaxResult.error(e.getMessage());
+ }
+ }
+
+
+ @GetMapping("/delTbBycusCardIdAndProId")
+ @ApiOperation(value = "鏍规嵁瀹㈡埛韬唤璇佸彿鍜岄」鐩埗椤筰d鍒犻櫎涓存椂琛ㄦ暟鎹�")
+ @Transactional
+ public AjaxResult delTbBycusCardIdAndProId(@RequestParam @ApiParam(value = "韬唤璇佸彿") String cusCardId,
+ @RequestParam @ApiParam(value = "鐖堕」id") String proId) {
+
+ if (transitionService.delTbBycusCardIdAndProId(cusCardId, proId)) {
+ return AjaxResult.success();
+ }
+ return AjaxResult.error("璁板綍涓嶅瓨鍦�!");
+ }
+
+
+ @GetMapping("/revokeTjOrderByTjCardId")
+ @ApiOperation(value = "鏍规嵁灏辫瘖鍙锋挙閿�鐢宠璁板綍")
+ @Transactional
+ public AjaxResult revokeTjOrderByTjCardId(@RequestParam @ApiParam(value = "灏辫瘖鍙�") String cardId) {
+
+ LambdaQueryWrapper<TjOrder> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(TjOrder::getCardId, cardId);
+ TjOrder order = tjOrderService.getOne(queryWrapper);
+ order.setCardId(cardId);
+ String configByKey = configService.selectConfigByKey("sfkqdyhis");
+ if (configByKey.equals("Y")) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("cardtype", "4");
+ map.put("input", order.getCardId());
+ LocalDate currentDate = LocalDate.now();
+ LocalDateTime startOfDay = currentDate.atStartOfDay();
+ LocalDateTime nineteenOClock = currentDate.atTime(LocalTime.of(19, 0));
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ String ksrq = startOfDay.format(formatter);
+ String jsrq = nineteenOClock.format(formatter);
+ map.put("ksrq", ksrq);
+ map.put("jsrq", jsrq);
+ AjaxResult result = hisApiGetMethodService.getHISDataNew("Getoutpatientcostinfo", map);
+ if (Integer.parseInt(String.valueOf(result.get("code"))) == 200) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎾ら攢澶辫触,闂ㄨ瘖鎮ｈ�呰垂鐢ㄦ竻鍗曚俊鎭笉涓虹┖");
+ } else {
+ boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order, lisApiMethod.isUseLisAndPacsRegister(order));
+ if (zfHisApiMethods) {
+ return AjaxResult.success("鎾ら攢鎴愬姛", map);
+ } else {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
+ }
+ }
+ }
+ return AjaxResult.success();
+ }
+
+
+ @GetMapping("/revokeTjOrderByTjh")
+ @ApiOperation(value = "鏍规嵁灏变綋妫�鍙峰垹闄よ褰�")
+ @Transactional
+ public AjaxResult revokeTjOrderByTjh(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNum) {
+
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
+ if (null != order) {
+// String payByTjNum = tjOrderService.isPayByTjNum(String.valueOf(order.getOrderId()));
+// if (null != payByTjNum) {
+// return AjaxResult.error("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
+// }
+ tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
+ tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
+ remarkService.deletedOrderRemarkByTjNum(tjNum);
+ tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
+ transitionService.deletedTbTransitionByTjNum(tjNum);
+ }
+ return AjaxResult.success();
+ }
+
+
+ @GetMapping("/getBlproByTjh")
+ @ApiOperation(value = "鏍规嵁浣撴鍙疯幏鍙栬ˉ褰曢」鐩褰�")
+ @Transactional
+ public AjaxResult getBlproByTjh(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNum) {
+
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
+ if (null != order) {
+ LambdaQueryWrapper<TjProBl> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjProBl::getTjh, tjNum);
+ List<TjProBl> blList = blService.list(wq);
+ if (null != blList && blList.size() > 0) {
+ for (TjProBl bl : blList) {
+ LambdaQueryWrapper<TjOrderRemark> wqr = new LambdaQueryWrapper<>();
+ wqr.eq(TjOrderRemark::getJxbz, bl.getBldh());
+ List<TjOrderRemark> remarkList = remarkService.list(wqr);
+ if (null != remarkList && remarkList.size() > 0) {
+ List<Long> collect = remarkList.stream().map(TjOrderRemark::getProId).collect(Collectors.toList());
+ LambdaQueryWrapper<TjProject> wqp = new LambdaQueryWrapper<>();
+ wqp.in(TjProject::getProId, collect);
+ List<TjProject> projectList = projectService.list(wqp);
+ for (TjProject project : projectList) {
+ project.setChildren(projectService.getTjProjectListBySoneId(String.valueOf(project.getProId())));
+ }
+ bl.setProjectList(projectList);
+ }
+ }
+ return AjaxResult.success(blList);
+ }
+ return AjaxResult.success(null);
+ }
+ return AjaxResult.error("鏆傛棤浣撴璁板綍");
+ }
+
+
+ @PostMapping("/revokeBlProByBldhAndTjh")
+ @ApiOperation(value = "鏍规嵁琛ュ綍鍗曞彿鍜屼綋妫�鍙峰垹闄よ褰�")
+// @Transactional
+ public AjaxResult revokeBlProByBldhAndTjh(@RequestBody TjProBlDto dto) {
+
+ if (null == dto.getBldhs() || dto.getBldhs().size() == 0) {
+ log.info("璇烽�夋嫨瑕佹挙閿�鐨勮ˉ褰曢」鐩�");
+ return AjaxResult.error("璇烽�夋嫨瑕佹挙閿�鐨勮ˉ褰曢」鐩�");
+ }
+
+ TjOrder order = tjOrderService.getOrderByTjNum(dto.getTjh());
+ if (null != order) {
+ String configByKey = configService.selectConfigByKey("sfkqdyhis");
+ if (null != configByKey && configByKey.equals("Y")) {
+ log.info("dto鐨勬暟鎹槸" + JSONUtil.toJsonStr(dto));
+ HashMap<String, Object> hisRequestParams = new HashMap<>();
+ hisRequestParams.put("patientId", order.getCardId());
+ AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
+ log.info("queryPay ->{}", JSONUtil.toJsonStr(queryPay));
+ if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
+ List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data");
+ log.info("data鐨勬暟鎹槸" + JSONUtil.toJsonStr(data));
+// BigDecimal cateFeeAll = BigDecimal.ZERO;
+// List<String> advIds = new ArrayList<>();
+ List<LtkjJianchajianyanTree> buLuXmXinXi = tjOrderService.getBuLuXmXinXi(dto.getBldhs(), order.getCardId());
+ log.info("buLuXmXinXi鐨勫�间负:==========" + buLuXmXinXi);
+ if (null != buLuXmXinXi && !buLuXmXinXi.isEmpty()) {
+ for (Map<String, String> datum : data) {
+ for (LtkjJianchajianyanTree tree : buLuXmXinXi) {
+ String advId = datum.get("Adv_Id").split("_")[1];
+ log.info("advid鐨勫�间负:==========" + advId);
+ log.info("tree鐨勫�间负:==========" + advId);
+ BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
+ log.info("cateFee鐨勫�间负:==========" + cateFee);
+ log.info("tree.getFyhj()鐨勫�间负:==========" + tree.getFyhj());
+ if (tree.getSqdh().equals(advId) && cateFee.compareTo(new BigDecimal(tree.getFyhj())) == 0) {
+ log.info("璇ラ」鐩凡缂磋垂涓嶅彲鎾ら攢");
+ return AjaxResult.error("璇ラ」鐩凡缂磋垂涓嶅彲鎾ら攢!!!");
+ }
+ }
+ }
+ }
+ }
+
+ boolean b = hisApiMethod.ZfBlXm(dto.getBldhs(), order);
+ if (!b) {
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ log.info("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
+ return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
+ }
+ }
+ try {
+ extracted(dto, order);
+ } catch (Exception e) {
+ log.info("鎾ら攢澶辫触,鍒犻櫎琛ㄥけ璐�");
+ return AjaxResult.error("鎾ら攢澶辫触,鍒犻櫎琛ㄥけ璐�!");
+ }
+ return AjaxResult.success();
+ }
+ return AjaxResult.error();
+ }
+
+ // @Transactional(propagation =Propagation.REQUIRES_NEW)
+ public void extracted(TjProBlDto dto, TjOrder order) {
+ for (String bldh : dto.getBldhs()) {
+ remarkService.deleteTjOrderDetailByjxbz(bldh);
+ tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
+ tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh);
+ transitionService.deleteTjOrderDetailByjxbz(bldh);
+ blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, dto.getTjh()).eq(TjProBl::getBldh, bldh));
+ }
+ tjSamplingMapper.deleteByTjNumAndCusIdAndJxbz(dto.getTjh(), order.getUserId(), dto.getBldhs());
+ }
+
+
+ @PostMapping("/addYaoPinShenQing")
+ @ApiOperation(value = "鑽搧淇℃伅鐢宠")
+ @Transactional
+ public AjaxResult addYaoPinShenQing(@RequestBody OutpinmedicapplyDto dto) {
+ AjaxResult result = controller.Outpinmedicapply(dto);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if (null != code && code.equals("0")) {
+
+ }
+ return AjaxResult.success();
+ }
+
+
+ @GetMapping("/chushenyemianqijianjiekou")
+ @ApiOperation(value = "鍒濆椤甸潰寮冩鎺ュ彛")
+ @Transactional
+ public AjaxResult chushenyemianqijianjiekou(@RequestParam String tjNUm, @RequestParam String proId) {
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getTjNumber, tjNUm);
+ wq.eq(TjOrderRemark::getProId, proId);
+ TjOrderRemark remark = remarkService.getOne(wq);
+ remark.setType(2);
+ remarkService.updateById(remark);
+ return AjaxResult.success("鎿嶄綔鎴愬姛!");
+ }
+
+
+ @PostMapping("/zongjanyemianshjianzhou")
+ @ApiOperation(value = "鎬绘鑾峰彇鏃堕棿杞存帴鍙�")
+ @Transactional
+ public AjaxResult zongjanyemianshjianzhou(@RequestBody List<String> tjNUms) {
+
+ if(null !=tjNUms && !tjNUms.isEmpty()){
+ List<Map<String,Object>> list=new ArrayList<>();
+ for (String tjNUm : tjNUms) {
+ Map<String,Object> map=new HashMap<>();
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNUm);
+ if (null != order) {
+ int czwj = remarkService.panduaniscunzaiweijian(tjNUm);
+ int sfwc = remarkService.panduaniswancheng(tjNUm);
+ Date checkTime = order.getCheckTime();
+ Date reportTime = order.getReportTime();
+ Integer heshouStatus = order.getHeshouStatus();
+ Date lastTime = order.getPrintLastTime();
+ int a=0;
+ if (czwj == 0) {
+ //鏈
+ a=0;
+ }
+ if (czwj > 0) {
+ //鍦ㄦ
+ a=1;
+ }
+ if (sfwc == 0) {
+ //宸插畬鎴�
+ a=2;
+ }
+ if (null != checkTime) {
+ //宸插鏍�
+ a=3;
+ }
+ if (null != reportTime) {
+ //鐢熸垚鎶ュ憡
+ a=4;
+ }
+ if (heshouStatus==1) {
+ //鎶ュ憡鏍告敹
+ a=5;
+ }
+ if (null != lastTime) {
+ //宸插嚭鎶ュ憡
+ a=6;
+ }
+ map.put("tjNUm",tjNUm);
+ map.put("sjz",a);
+ list.add(map);
+ }
+ }
+ return AjaxResult.success(list);
+ }
+ return AjaxResult.error();
+ }
+
+
+
+ @PostMapping("/heshouchexiao")
+ @ApiOperation(value = "鎾ら攢鎶ュ憡鎺ュ彛")
+ @Transactional
+ public AjaxResult heshouchexiao(@RequestBody List<String> tjNUms) {
+
+ if(null !=tjNUms && !tjNUms.isEmpty()){
+
+ // 涓嶅湪浣跨敤閫昏緫鍒犻櫎 閫昏緫鍒犻櫎瀵艰嚧鎵撳嵃鎶ュ憡鐢熸垚 鏌ヨsql缂撴參
+ //閫昏緫鍒犻櫎鏁版嵁搴撻噷鐨勬姤鍛�
+ LambdaQueryWrapper<TjReport> wq1 = new LambdaQueryWrapper<>();
+ wq1.select(TjReport::getReId);
+ wq1.in(TjReport::getTjNumber, tjNUms);
+ wq1.eq(TjReport::getPrint, "pdf");
+ List<Long> list = tjReportService.list(wq1).stream().map(TjReport::getReId).collect(Collectors.toList());
+ for (String tjNUm : tjNUms) {
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNUm);
+ if(null !=order){
+ order.setHeshouStatus(0);
+ order.setHeshouTime(null);
+ order.setHeshouDoctor(null);
+ order.setPrintLastTime(null);
+ order.setReportTime(null);
+ order.setStatus(TjConstants.TJ_WAIT);
+ if (!tjOrderService.updateById(order)) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎿嶄綔澶辫触");
+ }
+ }
+ }
+ int i = tjReportService.deleteTjReportByReIds(list.toArray(new Long[]{}));
+ if (i == 0) {
+ return AjaxResult.error("鎾ゅ洖澶辫触锛�");
+ }
+ return AjaxResult.success("鎿嶄綔鎴愬姛");
+ }
+ return AjaxResult.error();
+ }
+
+
}
--
Gitblit v1.8.0