From 8ee03ce807822e08ab7daebddf88f4cd79993fce Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 16 十二月 2024 11:15:55 +0800
Subject: [PATCH] zjh202412016
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 8
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 305 +++++++++++++++++++++-----------------------------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 6
3 files changed, 137 insertions(+), 182 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 90bd1e0..b7188ec 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -321,7 +321,7 @@
public List<CsProVo> getCsProVos(String tjNumber,boolean sfzpacs) {
List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber,sfzpacs);
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
list.sort(new Comparator<CsProVo>() {
@Override
public int compare(CsProVo o1, CsProVo o2) {
@@ -1382,14 +1382,14 @@
List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanTable(tjNumber);
- if (null != remarkList && remarkList.size() > 0) {
+ if (null != remarkList && !remarkList.isEmpty()) {
for (TjOrderRemark remark : remarkList) {
Map<String, Object> parent = new HashMap<>();
parent.put("checkAdvice", one.getCheckAdvice());
parent.put("parent", remark.getProName());
parent.put("parentId", remark.getProId().toString());
List<TjOrderDetail> dels = new ArrayList<>();
- if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
+ if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if (remark.getProId().equals(tjOrderDetail.getProId())) {
String ckfw = tjOrderDetail.getStanId();
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 4526fca..718e290 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
@@ -411,6 +411,7 @@
@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,
@@ -422,145 +423,11 @@
Map<String, Object> map = new HashMap<>();
List<Long> cusIds = null;
if (null != name) {
-// List<TjCustomer> customerList;
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
wqq.like(TjCustomer::getCusName, name);
cusIds = tjCustomerService.list(wqq).stream().map(TjCustomer::getCusId).collect(Collectors.toList());
-// if (StrUtil.isNotBlank(dw)){
-// wqq.like(TjCustomer::getCompName,dw);
-// customerList = tjCustomerService.list(wqq);
-// }else {
-// customerList = tjCustomerService.list(wqq);
-// }
-// if (null != customerList && !customerList.isEmpty()) {
-// 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.isEmpty()) {
-// 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()));
-// 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());
-// }
-// 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);
-// }
-// else {
-// if (StrUtil.isNotBlank(dw)){
-// wqq = new LambdaQueryWrapper<>();
-// wqq.like(TjCustomer::getCusName, name);
-// customerList = tjCustomerService.list(wqq);
-// LambdaQueryWrapper<DictComp> wrapper = new LambdaQueryWrapper<>();
-// wrapper.like(DictComp::getCnName,dw);
-// List<String> list = iDictCompService.list(wrapper).stream().map(DictComp::getCnName).collect(Collectors.toList());
-// if (null != customerList && !customerList.isEmpty()) {
-// List<TjOrder> list1 = 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.in(TjOrder::getFirmId, list);
-// }
-// wq.eq(TjOrder::getUserId, customer.getCusId());
-// list1.addAll(tjOrderService.list(wq));
-// }
-// List<TjOrder> collect = null;
-// if (!list1.isEmpty()) {
-// for (TjOrder order : list1) {
-// 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()));
-// 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());
-// }
-// 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 = list1.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);
-// }
-// }
-// }
-
}
+
Page<TjOrder> page1 = new Page<>(pageNum, pageSize);
LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
if (null != djbeginTime && null != djendTime) {
@@ -586,12 +453,85 @@
wq.in(TjOrder::getUserId, cusIds);
}
-// if (StrUtil.isNotBlank(dw)){
-// LambdaQueryWrapper<DictComp> wrapper = new LambdaQueryWrapper<>();
-// wrapper.like(DictComp::getCnName,dw);
-// List<String> list = iDictCompService.list(wrapper).stream().map(DictComp::getDrugManufacturerId).collect(Collectors.toList());
-// wq.in(TjOrder::getFirmId,list);
-// }
+ 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) {
+ //宸插畬鎴�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);
+ }
+ if(zt==4){
+ wq.isNotNull(TjOrder::getReportTime);
+ }
+ if(zt==5){
+ wq.eq(TjOrder::getHeshouStatus,1);
+ }
+ if(zt==6){
+ wq.isNotNull(TjOrder::getPrintLastTime);
+ }
+ }
wq.orderByDesc(TjOrder::getCreateTime);
Page<TjOrder> page2 = tjOrderService.page(page1, wq);
@@ -633,35 +573,50 @@
Date reportTime = order.getReportTime();
Integer heshouStatus = order.getHeshouStatus();
Date lastTime = order.getPrintLastTime();
- if (czwj == 0) {
- //鏈
- order.setZt("鏈");
- }
- if (czwj > 0) {
- //鍦ㄦ
- order.setZt("鍦ㄦ");
- }
- if (sfwc == 0) {
- //宸插畬鎴�
- order.setZt("宸插畬鎴�");
- }
- if (null != checkTime) {
- //宸插鏍�
- order.setZt("宸插鏍�");
- }
- if (null != reportTime) {
- //鐢熸垚鎶ュ憡
- order.setZt("鐢熸垚鎶ュ憡");
- }
- if (1== heshouStatus) {
- //鎶ュ憡鏍告敹
- order.setZt("鎶ュ憡鏍告敹");
- }
- if (null != lastTime) {
- //宸插嚭鎶ュ憡
- order.setZt("宸插嚭鎶ュ憡");
- }
+ 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("宸插嚭鎶ュ憡");
+ }
+ }
}
}
map.put("list", list);
@@ -2813,9 +2768,9 @@
//淇敼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::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);
}
@@ -2842,9 +2797,9 @@
try {
shengchengbgmoban(byId.getTjNumber(), byId, tjCustomer, reportTemplate, zongJianYiShiQianMing);
byId.setStatus(TjConstants.TJ_END);
- byId.setReportTime(date);
- byId.setPrintLastTime(date);
- byId.setDownloadLastTime(date);
+// byId.setReportTime(date);
+// byId.setPrintLastTime(date);
+// byId.setDownloadLastTime(date);
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
e.printStackTrace();
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index 5214c0e..a08a3e2 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -371,8 +371,8 @@
LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TjOrder::getTjNumber, tjNumber);
updateWrapper.set(TjOrder::getReportTime, new Date());
- updateWrapper.set(TjOrder::getPrintLastTime, new Date());
- updateWrapper.set(TjOrder::getDownloadLastTime, new Date());
+// updateWrapper.set(TjOrder::getPrintLastTime, new Date());
+// updateWrapper.set(TjOrder::getDownloadLastTime, new Date());
updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
tjOrderService.update(updateWrapper);
return AjaxResult.success("宸茬敓鎴愭姤鍛婏紒鍙洿鎺ョ偣鍑婚瑙堬紒");
@@ -449,8 +449,8 @@
// updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
tjOrder.setStatus(TjConstants.TJ_END);
tjOrder.setReportTime(date);
- tjOrder.setPrintLastTime(date);
- tjOrder.setDownloadLastTime(date);
+// tjOrder.setPrintLastTime(date);
+// tjOrder.setDownloadLastTime(date);
tjOrderService.updateById(tjOrder);
}
return ajaxResult;
--
Gitblit v1.8.0