From 4ccd96e52b9815ddfd5528fbebc6560042ec189b Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期五, 22 十二月 2023 10:49:13 +0800
Subject: [PATCH] zjh 本地 2023/12/22 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 88 +++++++++++++++++++++++++++++++++----------
1 files changed, 67 insertions(+), 21 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 635c883..ae3bb0a 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
@@ -348,9 +348,12 @@
for (TjOrder order : list) {
TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
if (null != tjCustomer) {
- order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
- order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
- order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+// 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());
@@ -884,10 +887,45 @@
tjFlowingWater.setPayStasus(3L);
}
}
+
+ //璋冪敤SQL server鎷垮彇鏀惰垂鎯呭喌
+ //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
+ final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
+ if ("Y".equals(getInfoFromSqlData)){
+
+ //鏌ヨ鏄惁his宸叉敹璐� 鑻ユ敹璐瑰垯灏嗘祦姘磋〃鏀惰垂鐘舵�佹敼鎴愬凡鏀惰垂
+ LambdaQueryWrapper<LtkjMiddleHead> middleHeadLambdaQueryWrapper =new LambdaQueryWrapper<>();
+ middleHeadLambdaQueryWrapper.eq(LtkjMiddleHead::getPatId,tjCustomer.getCusIdcard());
+ middleHeadLambdaQueryWrapper.eq(LtkjMiddleHead::getIsCanceled,"N");
+ middleHeadLambdaQueryWrapper.eq(LtkjMiddleHead::getIsChg,"Y");
+ LtkjMiddleHead middleHead = headService.getOne(middleHeadLambdaQueryWrapper);
+ if(null !=middleHead){
+ tjFlowingWater.setPayStasus(1L);
+ }
+ 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();
+ }
+ }
+ }
+
+ }
+ }
+
+
tjFlowingWater.setOrderId(tjOrder.getOrderId());
Date date1 = new Date(System.currentTimeMillis());
String s1 = SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1);
- tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "") + s1);
+ tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName().toUpperCase(), "") + s1);
if (null != mallOrder) {
if (mallOrder.getOrderStatus().equals(201L)) {
tjFlowingWater.setCopeWith(mallOrder.getActualPrice());
@@ -933,23 +971,28 @@
}
//璋冪敤SQL server鎷垮彇鏀惰垂鎯呭喌
- 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();
- }
- }
- }
+ //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�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();
+// }
+// }
+// }
+//
+// }
+// }
- }
return AjaxResult.success(tjNumber);
}
return AjaxResult.error();
@@ -1276,6 +1319,9 @@
for (TjOrderRemark remark : remarkList) {
TjProject project = projectService.getTjProjectById(String.valueOf(remark.getProId()));
if (null != project) {
+ if ("N".equals(project.getNeedReport())){
+ continue;
+ }
remark.setProCheckType(project.getProCheckType());
remark.setProName(project.getProName());
}
@@ -1658,7 +1704,7 @@
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
}
- System.out.println("杩欐浠ｇ爜鏃堕棿" + (System.currentTimeMillis() - l));
+// System.out.println("杩欐浠ｇ爜鏃堕棿" + (System.currentTimeMillis() - l));
}
--
Gitblit v1.8.0