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 | 574 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 367 insertions(+), 207 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 80648ee..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
@@ -25,6 +25,7 @@
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;
@@ -80,6 +81,7 @@
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;
@@ -226,6 +228,7 @@
private LisJyflhbService lisJyflhbService;
@Autowired
private ISysDictDataService sysDictDataService;
+
//灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
public JSONObject getJSONObject(String builder) {
String Response = JSONUtil.parseObj(builder).getStr("Response");
@@ -408,73 +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());
- }
- }
- TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber());
- if(null !=dycs)order.setDycs(Math.toIntExact(dycs.getDycs()));
- }
- 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) {
@@ -490,6 +443,108 @@
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);
@@ -508,20 +563,74 @@
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()));
}
- 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());
+ 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("宸插嚭鎶ュ憡");
}
}
- TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber());
- if(null !=dycs)order.setDycs(Math.toIntExact(dycs.getDycs()));
}
}
map.put("list", list);
@@ -534,83 +643,39 @@
@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) String dw,
@ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) String djbeginTime,
@ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) String djendTime) {
- Map<String, Object> map = new HashMap<>();
- if (null != name) {
+ /* 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.isEmpty()) {
- 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.isEmpty()) {
-
- 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(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 (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);
+ }
+ 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);
@@ -625,14 +690,18 @@
list.get(i).setTjCustomerSex(tjCustomer.getCusSex());
list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
list.get(i).setTjCustomerName(tjCustomer.getCusName());
- list.get(i).setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
+ 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())) {
@@ -643,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);
}
@@ -942,7 +1015,8 @@
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());
@@ -951,7 +1025,6 @@
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() && tjOrder.getTjType().equals("1")) {
@@ -960,6 +1033,16 @@
tjOrder.setTjType("2");
}
}
+
+ 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());
@@ -973,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())));
}
@@ -1146,7 +1228,7 @@
//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);
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
}
// 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
@@ -1159,7 +1241,7 @@
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
- addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser,null);
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
}
// pacsApiMethodService.OrderAdd(tjCustomer,tjOrder);
@@ -1169,7 +1251,7 @@
return AjaxResult.error();
}
- public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser,String jxbz) {
+ 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");
@@ -1181,16 +1263,16 @@
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());
+ 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.setSpecimenTypeCode(project1.getSpecimenType());
+ sampling.setSpecimenType(dictLabel);
+ sampling.setJyxmdm(project.getProId().toString());
}
sampling.setSamplingNumber(format);
@@ -1214,9 +1296,9 @@
}
}
String config = configService.selectConfigByKey("sfkqdyhis");
- if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))){
+ if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))) {
AjaxResult ajaxResult = lisApiMethod.getJyFlHb();
- if (ajaxResult.get("code").toString().equals("200")){
+ if (ajaxResult.get("code").toString().equals("200")) {
String str = ajaxResult.get("data").toString();
str = str.replace("=", ":");
JSONArray array = JSONUtil.parseArray(str);
@@ -1228,12 +1310,12 @@
lisJyflhb.setMc(object.getStr("mc"));
lisJyflhb.setFlbm(object.getStr("flbm"));
LambdaQueryWrapper<LisJyflhb> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LisJyflhb::getFlbm,lisJyflhb.getFlbm());
+ wrapper.eq(LisJyflhb::getFlbm, lisJyflhb.getFlbm());
LisJyflhb jyflhb = lisJyflhbService.getOne(wrapper);
if (jyflhb == null) {
lisJyflhb.setId(IdUtil.getSnowflake().nextId());
lisJyflhbService.save(lisJyflhb);
- }else {
+ } else {
lisJyflhb.setId(jyflhb.getId());
lisJyflhbService.updateById(lisJyflhb);
}
@@ -1242,7 +1324,6 @@
}
}
-
@PostMapping("/addPlOrderAndDetail")
@@ -1718,10 +1799,10 @@
transitionService.deletedTbTransitionListByCusIdAndPac(cusId, cardId);
List<TjPackageProject> ppList = tjPackageProjectService.getTjPackageProjectListByPacId(String.valueOf(pacId));
if (null != ppList && !ppList.isEmpty()) {
- String string = transitionService.panduantaocanshifouchongfu(cusId,pacId);
- if(!StringUtils.isBlank(string)){
+ String string = transitionService.panduantaocanshifouchongfu(cusId, pacId);
+ if (!StringUtils.isBlank(string)) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error("鎿嶄綔澶辫触! 浠ヤ笅椤圭洰宸插瓨鍦�: "+string);
+ return AjaxResult.error("鎿嶄綔澶辫触! 浠ヤ笅椤圭洰宸插瓨鍦�: " + string);
}
transitionService.saveRedisTransitionByPacId(cusId, cardId, pacId);
}
@@ -2553,16 +2634,18 @@
// }
}
- @PostMapping("/heXiaoByIds/{orderIds}")
+ @PostMapping("/heXiaoByIds")
@ApiOperation(value = "鏍告敹鎶ュ憡鈥斺�斺�斺�斺�斺�旀�绘瀹℃牳閫氳繃鍚庡彲浠ユ牳閿�锛屾牳鏀跺悗鎵嶈兘鎵撳嵃")
@Transactional
@RepeatSubmit
- public AjaxResult heXiaoByIds(@PathVariable String[] orderIds) {
+ 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) {
+
+ /*if (byId.getReportTime() == null) {
LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
@@ -2577,34 +2660,20 @@
//淇敼order琛ㄤ腑鐨勬墦鍗版姤鍛婃椂闂翠负褰撳墠鏃堕棿
LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TjOrder::getTjNumber, byId.getTjNumber());
- updateWrapper.set(TjOrder::getReportTime, new Date());
- updateWrapper.set(TjOrder::getPrintLastTime, new Date());
- updateWrapper.set(TjOrder::getDownloadLastTime, new Date());
updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
tjOrderService.update(updateWrapper);
}
- String hisRegistrationId = byId.getCardId();
- Date createTime = byId.getCreateTime();
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String ksrq = dateFormat.format(createTime);
- String jsrq = dateFormat.format(date);
- HashMap<String, Object> params = new HashMap<>();
- params.put("his_registration_id", hisRegistrationId);
- params.put("ksbm", "");
- params.put("pationid", "");
- params.put("ksrq", ksrq);
- params.put("jsrq", jsrq);
- params.put("pagecount", 100);
- params.put("page", 1);
+
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);
+ shengchengbgmoban(byId.getTjNumber(), byId, tjCustomer, reportTemplate, zongJianYiShiQianMing);
byId.setStatus(TjConstants.TJ_END);
- byId.setReportTime(date);
- byId.setPrintLastTime(date);
- byId.setDownloadLastTime(date);
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
e.printStackTrace();
@@ -2612,8 +2681,7 @@
logger.error("鐢熸垚鎶ュ憡寮傚父");
return AjaxResult.error("鐢熸垚鎶ュ憡寮傚父,鏍告敹澶辫触");
}
- }
-
+ }*/
byId.setHeshouStatus(1);
byId.setHeshouDoctor(UserHoder.getLoginUser().getUserId());
byId.setHeshouTime(date);
@@ -2623,13 +2691,14 @@
}
}
}
+ }
return AjaxResult.success("鏍告敹鎴愬姛");
}
- public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) throws Exception {
-// AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
- AjaxResult ajaxResult = hisPDFUtil.hisPDFNew(tjOrder, tjCustomer, reportTemplate);
+ 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 {
@@ -2644,12 +2713,6 @@
tjReport.setType("浣撴鎶ュ憡");
tjReport.setPrint("pdf");
tjReportService.save(tjReport);
-// Date date = new Date();
-// tjOrder.setStatus(TjConstants.TJ_END);
-// tjOrder.setReportTime(date);
-// tjOrder.setPrintLastTime(date);
-// tjOrder.setDownloadLastTime(date);
-// tjOrderService.updateById(tjOrder);
}
return ajaxResult;
}
@@ -2781,7 +2844,7 @@
// if (null != payByTjNum) {
// return AjaxResult.error("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
// }
- if(null !=order.getFinishTime()) return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲鎾ら攢!!!");
+ if (null != order.getFinishTime()) return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲鎾ら攢!!!");
tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
remarkService.deletedOrderRemarkByTjNum(tjNum);
@@ -3139,16 +3202,113 @@
@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);
+ 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(1);
+ 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