From dba27f21bc05c999ace46fe15be6e4c824ed9104 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 13 十二月 2024 18:40:09 +0800
Subject: [PATCH] zjh202412013
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 305 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 220 insertions(+), 85 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 27d2a91..047ce66 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
@@ -80,6 +80,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 +227,7 @@
private LisJyflhbService lisJyflhbService;
@Autowired
private ISysDictDataService sysDictDataService;
+
//灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
public JSONObject getJSONObject(String builder) {
String Response = JSONUtil.parseObj(builder).getStr("Response");
@@ -420,7 +422,7 @@
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
wqq.like(TjCustomer::getCusName, name);
List<TjCustomer> customerList = tjCustomerService.list(wqq);
- if (null != customerList && customerList.size() > 0) {
+ if (null != customerList && !customerList.isEmpty()) {
List<TjOrder> list = new ArrayList<>();
for (TjCustomer customer : customerList) {
LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
@@ -431,7 +433,7 @@
list.addAll(tjOrderService.list(wq));
}
List<TjOrder> collect = null;
- if (list.size() > 0) {
+ if (!list.isEmpty()) {
for (TjOrder order : list) {
TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
if (null != tjCustomer) {
@@ -447,21 +449,26 @@
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());
+ }
+ 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()));
}
- 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());
}
@@ -508,20 +515,24 @@
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());
- } else if (null != dwDeptService.getById(order.getPacId())) {
- order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
+ 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()));
}
- TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber());
- if(null !=dycs)order.setDycs(Math.toIntExact(dycs.getDycs()));
}
}
map.put("list", list);
@@ -534,12 +545,14 @@
@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(defaultValue = "0") 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) {
+ if (StringUtil.isNotBlank(name)) {
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
wqq.like(TjCustomer::getCusName, name);
List<TjCustomer> customerList = tjCustomerService.list(wqq);
@@ -547,9 +560,13 @@
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鎵嶈兘鎵撳嵃
+ if (dyzt == 0) {
+ wq.isNull(TjOrder::getPrintLastTime);
+ wq.eq(TjOrder::getHeshouStatus, 1);
+ } else {
+ wq.isNotNull(TjOrder::getPrintLastTime);
+ }
list.addAll(tjOrderService.list(wq));
}
List<TjOrder> collect = null;
@@ -564,13 +581,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).setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+ list.get(i).setTjCustomerPhone(tjCustomer.getCusPhone());
+ 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())) {
list.get(i).setPacName(tjPackageService.getById(list.get(i).getPacId()).getPacName());
@@ -579,16 +601,6 @@
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());
}
@@ -602,15 +614,88 @@
}
}
+ if (StringUtil.isNotBlank(dw)) {
+ LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
+ wqq.like(TjCustomer::getCompName,dw);
+ List<TjCustomer> customerList = tjCustomerService.list(wqq);
+ List<TjOrder> list = new ArrayList<>();
+ if (null != customerList && !customerList.isEmpty()) {
+ for (TjCustomer customer : customerList) {
+ LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrder::getUserId, customer.getCusId());
+ if (dyzt == 0) {
+ wq.isNull(TjOrder::getPrintLastTime);
+ wq.eq(TjOrder::getHeshouStatus, 1);
+ } else {
+ wq.isNotNull(TjOrder::getPrintLastTime);
+ }
+ list.addAll(tjOrderService.list(wq));
+ }
+ }
+ List<String> dwIds= iDictCompService.getdwIdByDwName(dw);
+
+ LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
+ wq.in(TjOrder::getFirmId,dwIds);
+ list.addAll(tjOrderService.list(wq));
+ List<TjOrder> collect = null;
+ if (!list.isEmpty()) {
+ List<TjOrder> orders = list.stream().distinct().collect(Collectors.toList());
+ for (int i = 0; i < orders.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(tjCustomer.getCusPhone());
+ list.get(i).setTjCusIdCard(tjCustomer.getCusIdcard());
+
+ 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())) {
+ 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());
+ }
+ }
+ }
+ 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);
+
+
+ }
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);
}
wq.orderByDesc(TjOrder::getCreateTime);
Page<TjOrder> page2 = tjOrderService.page(page1, wq);
@@ -625,14 +710,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,14 +732,14 @@
}
}
//浠庢墦鍗拌褰曟煡鍑烘渶鏂版墦鍗版椂闂�
- 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);
@@ -1146,7 +1235,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 +1248,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 +1258,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 +1270,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 +1303,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 +1317,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 +1331,6 @@
}
}
-
@PostMapping("/addPlOrderAndDetail")
@@ -1718,10 +1806,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);
}
@@ -2599,8 +2687,12 @@
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);
@@ -2627,10 +2719,10 @@
}
- public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) throws Exception {
+ public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate, TjReportTemplate zongJianYiShiQianMing) throws Exception {
// AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
// AjaxResult ajaxResult = hisPDFUtil.hisPDFNew(tjOrder, tjCustomer, reportTemplate);
- AjaxResult ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate);
+ AjaxResult ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate, zongJianYiShiQianMing);
if (!ajaxResult.get("code").toString().equals("200")) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
} else {
@@ -2782,7 +2874,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);
@@ -3140,10 +3232,10 @@
@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);
remarkService.updateById(remark);
@@ -3151,5 +3243,48 @@
}
+
+ @GetMapping("/zongjanyemianshjianzhou")
+ @ApiOperation(value = "鎬绘鑾峰彇鏃堕棿杞存帴鍙�")
+ @Transactional
+ public AjaxResult zongjanyemianshjianzhou(@RequestParam String tjNUm) {
+ 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();
+ if(czwj==0){
+ //鏈
+ return AjaxResult.success(0);
+ } else if(czwj>0) {
+ //鍦ㄦ
+ return AjaxResult.success(1);
+ }else if(sfwc==0){
+ //宸插畬鎴�
+ return AjaxResult.success(2);
+ }else if(null !=checkTime){
+ //宸插鏍�
+ return AjaxResult.success(3);
+ }else if(null !=reportTime){
+ //鐢熸垚鎶ュ憡
+ return AjaxResult.success(4);
+ }else if(null !=heshouStatus){
+ //鎶ュ憡鏍告敹
+ return AjaxResult.success(5);
+ }else if(null !=lastTime){
+ //宸插嚭鎶ュ憡
+ return AjaxResult.success(6);
+ }else {
+ return AjaxResult.error();
+ }
+ }
+ return AjaxResult.error();
+ }
+
+
+
}
--
Gitblit v1.8.0