From 8f850d2a6b4a227a0e1de66c3212506cc14d8745 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 22 一月 2025 18:05:21 +0800
Subject: [PATCH] zjh20250122
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java | 6 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java | 5 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 3 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java | 4 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java | 3 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java | 22 +++++++++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 45 +++++++++++++++++-----
ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java | 4 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjGroupingProMapper.java | 2
9 files changed, 74 insertions(+), 20 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
index 7dc3911..ee9c8d3 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
@@ -65,6 +65,8 @@
private TjOrderController tjOrderController;
@Autowired
private ISysUserService userService;
+ @Autowired
+ private TjOrderYcxmService ycxmService;
/**
* 鏀堕��璐瑰洖璋冩帴鍙�
@@ -138,7 +140,7 @@
remarkService.deletedOrderRemarkByTjNum(order.getTjNumber());
tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
transitionService.deletedTbTransitionByTjNum(order.getTjNumber());
-
+ ycxmService.delOrderYcXmJyByTjh(order.getTjNumber());
TjCustomer customer = tjCustomerService.getById(order.getUserId());
customer.setCardId("0");
tjCustomerService.updateById(customer);
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 f72ae6f..e40cbd1 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
@@ -234,6 +234,8 @@
private TjFlowingWaterHisService tjFlowingWaterHisService;
@Resource
private ITjXdPictureService xdPictureService;
+ @Autowired
+ private TjOrderYcxmService ycxmService;
//灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
public JSONObject getJSONObject(String builder) {
@@ -2001,6 +2003,15 @@
return AjaxResult.error("鎿嶄綔澶辫触! 浠ヤ笅椤圭洰宸插瓨鍦�: " + string);
}
transitionService.saveRedisTransitionByPacId(cusId, cardId, pacId);
+
+ //琛ュ樊浠�
+ List<Map<String,Object>> cjMaps = groupingProService.huoquxiangmuchajia(pacId.toString(), cusId);
+ if(null !=cjMaps && !cjMaps.isEmpty()){
+ for (Map<String, Object> cjMap : cjMaps) {
+ transitionService.buxiangmuchajia(cusId,pacId.toString(),cjMap.get("xmid").toString(),new BigDecimal(cjMap.get("cj").toString()));
+ }
+ }
+
}
}
}
@@ -3086,6 +3097,7 @@
remarkService.deletedOrderRemarkByTjNum(tjNum);
tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
transitionService.deletedTbTransitionByTjNum(tjNum);
+ ycxmService.delOrderYcXmJyByTjh(tjNum);
TjCustomer customer = tjCustomerService.getById(order.getUserId());
customer.setCardId("0");
@@ -3694,9 +3706,11 @@
}
}
}
- int i = tjReportService.deleteTjReportByReIds(list.toArray(new Long[]{}));
- if (i == 0) {
- return AjaxResult.error("鎾ゅ洖澶辫触锛�");
+ if(!list.isEmpty()) {
+ int i = tjReportService.deleteTjReportByReIds(list.toArray(new Long[]{}));
+ if (i == 0) {
+ return AjaxResult.error("鎾ゅ洖澶辫触锛�");
+ }
}
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
@@ -3748,15 +3762,14 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error("鎿嶄綔澶辫触! 浠ヤ笅椤圭洰宸插瓨鍦�: " + string);
}
- transitionService.ttsaveTemoTransitionByGroupingId(cusId, cardId, pacId.toString());
-
- //琛ュ樊浠�
- List<Map<String,Object>> cjMaps = groupingProService.huoquxiangmuchajia(pacId.toString(), cusId);
- if(null !=cjMaps && !cjMaps.isEmpty()){
- for (Map<String, Object> cjMap : cjMaps) {
- transitionService.buxiangmuchajia(cusId,pacId.toString(),cjMap.get("xmid").toString(),new BigDecimal(cjMap.get("cj").toString()));
+ transitionService.ttsaveTemoTransitionByGroupingId(cusId, cardId, pacId.toString()) ;
+ //琛ュ樊浠�
+ List<Map<String,Object>> cjMaps = groupingProService.huoquxiangmuchajia(pacId.toString(), cusId);
+ if(null !=cjMaps && !cjMaps.isEmpty()){
+ for (Map<String, Object> cjMap : cjMaps) {
+ transitionService.buxiangmuchajia(cusId,pacId.toString(),cjMap.get("xmid").toString(),new BigDecimal(cjMap.get("cj").toString()));
+ }
}
- }
}
}
@@ -3781,6 +3794,16 @@
@GetMapping(value = "newgetTransitionList")
@ApiOperation(value = "鏈�鏂版煡璇㈣繃娓¤〃鏁版嵁")
public AjaxResult newgetTransitionList(@RequestParam @ApiParam(value = "瀹㈡埛id") String cusId) {
+// String pacId = transitionService.getTbTransitionPacId(cusId);
+// if(StringUtil.isNotBlank(pacId)){
+// //琛ュ樊浠�
+// List<Map<String,Object>> cjMaps = groupingProService.huoquxiangmuchajia(pacId, cusId);
+// if(null !=cjMaps && !cjMaps.isEmpty()){
+// for (Map<String, Object> cjMap : cjMaps) {
+// transitionService.buxiangmuchajia(cusId,pacId,cjMap.get("xmid").toString(),new BigDecimal(cjMap.get("cj").toString()));
+// }
+// }
+// }
List<TbTransition> list= transitionService.newgetTransitionList(cusId);
return AjaxResult.success(list);
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java
index 2cbd032..c4d8bb4 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java
@@ -123,8 +123,15 @@
@Log(title = "浣撴椤圭洰寤鸿瑙勫垯鏂拌〃", businessType = BusinessType.INSERT)
@PostMapping
@ApiOperation(value = "鏂板浣撴椤圭洰寤鸿瑙勫垯鏂拌〃")
- public AjaxResult add(@RequestBody TjProAdvicerules tjProAdvicerules) {
- return toAjax(tjProAdvicerulesService.insertTjProAdvicerules(tjProAdvicerules));
+ public AjaxResult add(@RequestBody TjProAdvicerules advicerules) {
+ if(StringUtil.isNotBlank(advicerules.getFwz())){
+ if(advicerules.getFwz().contains("-")){
+ String[] split = advicerules.getFwz().split("-");
+ advicerules.setFwzdz(split[1]);
+ advicerules.setFwzxz(split[0]);
+ }
+ }
+ return toAjax(tjProAdvicerulesService.save(advicerules));
}
/**
@@ -134,8 +141,15 @@
@Log(title = "浣撴椤圭洰寤鸿瑙勫垯鏂拌〃", businessType = BusinessType.UPDATE)
@PutMapping
@ApiOperation(value = "淇敼浣撴椤圭洰寤鸿瑙勫垯鏂拌〃")
- public AjaxResult edit(@RequestBody TjProAdvicerules tjProAdvicerules) {
- return toAjax(tjProAdvicerulesService.updateTjProAdvicerules(tjProAdvicerules));
+ public AjaxResult edit(@RequestBody TjProAdvicerules advicerules) {
+ if(StringUtil.isNotBlank(advicerules.getFwz())){
+ if(advicerules.getFwz().contains("-")){
+ String[] split = advicerules.getFwz().split("-");
+ advicerules.setFwzdz(split[1]);
+ advicerules.setFwzxz(split[0]);
+ }
+ }
+ return toAjax(tjProAdvicerulesService.updateById(advicerules));
}
/**
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 320bc64..714afe8 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
@@ -106,6 +106,8 @@
private IDictHospService dictHospService;
@Autowired
private ITjReportPrintService printService;
+ @Autowired
+ private TjOrderYcxmService ycxmService;
@GetMapping("/savePdf")
@ApiOperation(value = "浠庢湰鍦板瓨鍌ㄦā鏉垮埌鏁版嵁搴�")
@@ -2167,6 +2169,7 @@
one.setPrintLastTime(null);
one.setDownloadLastTime(null);
if (tjOrderService.updateById(one)) {
+ ycxmService.delOrderYcXmJyByTjh(tjNumber);
return AjaxResult.success("鎾ゅ洖鎴愬姛锛�");
}
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java
index c46b535..7ac71af 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java
@@ -90,7 +90,7 @@
zhxm.setPym(PinyinUtil.getFirstLetter(zhxm.getZhmc(), ""));
if (zhxmService.save(zhxm)) {
List<TjZhxmglpro> zhxmglpros = zhxm.getZhxmglpros();
- if (null != zhxmglpros && zhxmglpros.size() > 0) {
+ if (null != zhxmglpros && !zhxmglpros.isEmpty()) {
for (TjZhxmglpro zhxmglpro : zhxmglpros) {
TjZhxmglpro pro = new TjZhxmglpro();
pro.setZhId(zhxm.getId());
@@ -114,7 +114,7 @@
zhxm.setPym(PinyinUtil.getFirstLetter(zhxm.getZhmc(), ""));
if (zhxmService.updateById(zhxm)) {
List<TjZhxmglpro> zhxmglpros = zhxm.getZhxmglpros();
- if (null != zhxmglpros && zhxmglpros.size() > 0) {
+ if (null != zhxmglpros && !zhxmglpros.isEmpty()) {
LambdaQueryWrapper<TjZhxmglpro> wq = new LambdaQueryWrapper<>();
wq.eq(TjZhxmglpro::getZhId, zhxm.getId());
tjZhxmglproService.remove(wq);
@@ -143,7 +143,7 @@
List<TjZhxmglpro> list = tjZhxmglproService.list(wq);
StringBuilder allName = new StringBuilder();
// StringBuilder allSonName = new StringBuilder();
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
List<TjProject> projectList = new ArrayList<>();
BigDecimal money = new BigDecimal("0.00");
for (TjZhxmglpro zhxmglpro : list) {
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
index b7f5539..2b8116a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -364,4 +364,8 @@
"t.now_price=(t.now_price+#{cj})\n" +
"WHERE t.id=aa.id")
void buxiangmuchajia(@Param("idCard") String idCard,@Param("pacId") String pacId,@Param("proId") String proId,@Param("cj") BigDecimal cj);
+
+
+ @Select("SELECT a.pac_id FROM tb_transition a WHERE a.cus_id=#{idCard} AND isnull(a.tj_num) and !isnull(a.pac_id) LIMIT 1 ")
+ String getTbTransitionPacId(String cusId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjGroupingProMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjGroupingProMapper.java
index f911252..3cb9de5 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjGroupingProMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjGroupingProMapper.java
@@ -99,7 +99,7 @@
"\n" +
"SELECT a.parent_pro_id,SUM(a.now_price)ys FROM tb_transition a WHERE a.cus_id=#{cusIdCard} AND pac_id=#{groupingId} AND ISNULL(a.tj_num) GROUP BY a.parent_pro_id)aa\n" +
"ON\n" +
- "g.pro_id=aa.parent_pro_id AND g.grouping_id=#{groupingId} AND (g.ys_price-aa.ys)>0")
+ "trim(g.pro_id)=trim(aa.parent_pro_id ) where g.grouping_id=#{groupingId} AND (g.ys_price-aa.ys)>0")
List<Map<String,Object>> huoquxiangmuchajia(@Param("groupingId") String groupingId, @Param("cusIdCard") String cusIdCard);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
index 826b650..5d55477 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
@@ -144,4 +144,7 @@
TbTransition getOnwTbTransition(String idCard,String tjNumber);
void buxiangmuchajia(String idCard,String pacId,String proId,BigDecimal cj);
+
+
+ String getTbTransitionPacId(String cusId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
index d68b1b5..6606c14 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
@@ -247,4 +247,9 @@
public void buxiangmuchajia(String idCard, String pacId,String proId, BigDecimal cj) {
tbTransitionMapper.buxiangmuchajia( idCard, pacId,proId, cj);
}
+
+ @Override
+ public String getTbTransitionPacId(String cusId) {
+ return tbTransitionMapper.getTbTransitionPacId(cusId);
+ }
}
--
Gitblit v1.8.0