From 7930c05e0d5edfba8de2a5ab60e52532556a643b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 14 八月 2024 17:58:44 +0800
Subject: [PATCH] zjh 2024-08-14
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 146 +++++++++++++++++++++++++++++-------------------
1 files changed, 88 insertions(+), 58 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index 4b21bf8..8df6e9a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -34,6 +34,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.ibatis.jdbc.Null;
import org.springframework.beans.factory.annotation.Autowired;
@@ -64,6 +65,7 @@
@RestController
@RequestMapping("/system/dept")
@Api(tags = "绉戝閮ㄩ棬淇℃伅")
+@Slf4j
public class SysDeptController extends BaseController implements Serializable {
@Resource
private ISysDeptService deptService;
@@ -1313,12 +1315,12 @@
public AjaxResult addRemark(@ApiParam(value = "浣撴鐖堕」鐩娉ㄩ泦鍚�") @RequestBody List<TjOrderRemark> remarklList) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
- if (remarklList == null || remarklList.size() == 0) {
+ if (remarklList == null || remarklList.isEmpty()) {
return AjaxResult.success("鎿嶄綔澶辫触");
}
for (TjOrderRemark orderRemark : remarklList) {
List<String> summaryList = orderRemark.getSummaryList();
- if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null) ) {
+ if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null) ) {
orderRemark.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
}
LambdaQueryWrapper<TjOrder> qw = new LambdaQueryWrapper<>();
@@ -1331,7 +1333,7 @@
List<TjOrderDetail> tjOrderDetailList = orderRemark.getTjOrderDetailList();
final TjCustomer byId1 = customerService.getById(order.getUserId());
- if (null != tjOrderDetailList && tjOrderDetailList.size() > 0) {
+ if (null != tjOrderDetailList && !tjOrderDetailList.isEmpty()) {
//----------------------------------start
for (TjOrderDetail tjOrderDetail : tjOrderDetailList) {
final TjProject byId = projectService.getById(tjOrderDetail.getProId());
@@ -1376,7 +1378,7 @@
remarkService.save(remark);
} else {
one.setRemark(orderRemark.getRemark());
- if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null)) {
+ if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
}
// one.setDeptId(orderRemark.getDeptId());
@@ -1400,7 +1402,7 @@
* @param tjNumber
* @return
*/
- @Transactional
+// @Transactional
@GetMapping("/getParentList")
@ApiOperation(value = "鍖荤敓鐐瑰嚮浣撴淇℃伅璇︽儏(鍙樉绀虹埗椤圭洰鍒楄〃)")
public AjaxResult getParentList(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
@@ -1425,57 +1427,34 @@
tjFlowingWaterLambdaQueryWrapper.ne(TjFlowingWater::getPayStasus,2);
tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition,"N");
TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
-// if (tjFlowingWater1.getPayStasus() != 1){
- LambdaQueryWrapper<TjCustomer> tjCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
- tjCustomerLambdaQueryWrapper.eq(TjCustomer::getCusId,tjOrder.getUserId());
- TjCustomer tjCustomer = tjCustomerService.getOne(tjCustomerLambdaQueryWrapper);
+
HashMap<String, Object> hisRequestParams = new HashMap<>();
// 涓嶅湪闇�瑕佽韩浠借瘉鍙�
-// hisRequestParams.put("card_no",tjCustomer.getCusIdcard());
hisRequestParams.put("patientId",tjOrder.getCardId());
- AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
+ log.info("ltkj--- "+DateUtil.date()+"鎿嶄綔浜篿d: "+userId+"鎿嶄綔绉戝: "+sysUser.getDeptId()+"鎿嶄綔鐨勪綋妫�浜�: "+tjNumber);
+ AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
- List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data");
-// ArrayList<String> sqdhs = new ArrayList<>();
-// ArrayList<String> xmfls = new ArrayList<>();
- BigDecimal cateFeeAll = BigDecimal.ZERO;
- for (Map<String, String> datum : data) {
-// String advId = datum.get("Adv_Id").split("_")[1];
- BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
-// String cateCode = datum.get("CateCode");
- cateFeeAll = cateFeeAll.add(cateFee);
-// sqdhs.add(advId);
-// xmfls.add(cateCode);
- }
- /* LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.in(LtkjJianchajianyanTree::getSqdh, sqdhs)
- .in(LtkjJianchajianyanTree::getXmfl, xmfls)
- .eq(LtkjJianchajianyanTree::getCardId,tjOrder.getCardId())
- .groupBy(LtkjJianchajianyanTree::getType)
- .select(LtkjJianchajianyanTree::getFyhj);
- List<LtkjJianchajianyanTree> results = ltkjJianchajianyanTreeService.list(queryWrapper);
- BigDecimal total = results.stream()
- .map(item -> new BigDecimal(item.getFyhj()))
- .reduce(BigDecimal.ZERO, BigDecimal::add);*/
- BigDecimal fyhj = ltkjJianchajianyanTreeService.getLtkjJianchajianyanTreeFyhjByCardId(tjOrder.getCardId());
- if (cateFeeAll.compareTo(fyhj) != 0){
+// List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data");
+// BigDecimal cateFeeAll = BigDecimal.ZERO;
+// for (Map<String, String> datum : data) {
+// BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
+// cateFeeAll = cateFeeAll.add(cateFee);
+// }
+// BigDecimal fyhj = ltkjJianchajianyanTreeService.getLtkjJianchajianyanTreeFyhjByCardId(tjOrder.getCardId());
+// if (cateFeeAll.compareTo(fyhj) != 0){
+// return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
+// }
+
+ int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
+ if (sfsf > 0){
+ log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 瀛樺湪鏈即璐归」鐩殑 灏卞崟鏁� "+sfsf);
+ log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 瀛樺湪鏈即璐归」鐩殑 灏辫瘖鍙� "+tjOrder.getCardId()+" 浣撴鍙� "+tjOrder.getTjNumber());
return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
}
- tjFlowingWater.setPayStasus(1L);
- tjFlowingWater.setPayType(0L);
- tjFlowingWater.setTollCollectorId("148");
- tjFlowingWaterService.updateById(tjFlowingWater);
- Long tjSerialNumber = tjFlowingWater.getTjSerialNumber();
- LambdaQueryWrapper<TjOrderDetail> tjOrderDetailLambdaQueryWrapper = new LambdaQueryWrapper<>();
- tjOrderDetailLambdaQueryWrapper.eq(TjOrderDetail::getOrderId,tjOrder.getOrderId());
- List<TjOrderDetail> tjOrderDetails = detailService.list(tjOrderDetailLambdaQueryWrapper);
- List<Long> detailIds = tjOrderDetails.stream().map(TjOrderDetail::getOrderDetailId).collect(Collectors.toList());
- LambdaUpdateWrapper<TjOrderDetail> tjOrderDetailLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
- tjOrderDetailLambdaUpdateWrapper.set(TjOrderDetail::getFlowingWaterId,tjSerialNumber);
- tjOrderDetailLambdaUpdateWrapper.in(TjOrderDetail::getOrderDetailId,detailIds);
- detailService.update(tjOrderDetailLambdaUpdateWrapper);
+ extracted(tjOrder, tjFlowingWater);
}else {
+ log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 鏈煡璇㈠埌缂磋垂璁板綍鐨� 灏辫瘖鍙� "+tjOrder.getCardId()+" 浣撴鍙� "+tjOrder.getTjNumber());
return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
}
// }
@@ -1568,6 +1547,23 @@
return AjaxResult.success();
}
return AjaxResult.error();
+ }
+
+ @Transactional
+ public void extracted(TjOrder tjOrder, TjFlowingWater tjFlowingWater) {
+ tjFlowingWater.setPayStasus(1L);
+ tjFlowingWater.setPayType(0L);
+ tjFlowingWater.setTollCollectorId("148");
+ tjFlowingWaterService.updateById(tjFlowingWater);
+ Long tjSerialNumber = tjFlowingWater.getTjSerialNumber();
+ LambdaQueryWrapper<TjOrderDetail> tjOrderDetailLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjOrderDetailLambdaQueryWrapper.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
+ List<TjOrderDetail> tjOrderDetails = detailService.list(tjOrderDetailLambdaQueryWrapper);
+ List<Long> detailIds = tjOrderDetails.stream().map(TjOrderDetail::getOrderDetailId).collect(Collectors.toList());
+ LambdaUpdateWrapper<TjOrderDetail> tjOrderDetailLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+ tjOrderDetailLambdaUpdateWrapper.set(TjOrderDetail::getFlowingWaterId,tjSerialNumber);
+ tjOrderDetailLambdaUpdateWrapper.in(TjOrderDetail::getOrderDetailId,detailIds);
+ detailService.update(tjOrderDetailLambdaUpdateWrapper);
}
/**
@@ -1740,23 +1736,57 @@
/**
* 鏍规嵁椤圭洰id鑾峰彇寤鸿
*/
- @GetMapping("/getDeptAdvice/{proId}")
+ @GetMapping("/getDeptAdvice")
@ApiOperation(value = "鏍规嵁椤圭洰id鑾峰彇寤鸿")
- public AjaxResult getDeptAdvice(@ApiParam(value = "鐖堕」鐩」鐩甶d") @PathVariable String proId) {
- List<TjAdvice> list = new ArrayList<>();
+ public AjaxResult getDeptAdvice(@ApiParam(value = "鐖堕」鐩」鐩甶d") @RequestParam(required = false) String proId,
+ @ApiParam(value = "鍐呭") @RequestParam(required = false) String nr,
+ @ApiParam(value = "鎷奸煶鐮�") @RequestParam(required = false) String pym,
+ @ApiParam(value = "椤电爜") @RequestParam(defaultValue ="1") int page,
+ @ApiParam(value = "姣忛〉灞曠ず鏉℃暟") @RequestParam(defaultValue ="10") int pageSize) {
LambdaQueryWrapper<TjAdvice> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjAdvice::getProId, proId);
- List<TjAdvice> list1 = tjAdviceService.list(wq1);
- //濡傛灉娌℃湁椤圭洰id 灏辫繑鍥炴墍鏈夌殑寤鸿闆嗗悎
- if (list1.size() == 0) {
- return AjaxResult.success(tjAdviceService.list());
+ if(null !=proId){
+ wq1.eq(TjAdvice::getProId, proId);
}
- for (TjAdvice tjAdvice : list1) {
- list.add(tjAdvice);
+ if(null !=nr && !nr.isEmpty()){
+ wq1.like(TjAdvice::getTitle,nr);
+ }else if (null !=pym && !pym.isEmpty()){
+ wq1.like(TjAdvice::getTitle,pym);
+ }
+// else {
+// wq1.last("limit 20");
+// }
+ Page<TjAdvice> pages=new Page<>(page,pageSize);
+ Page<TjAdvice> advicePage = tjAdviceService.page(pages, wq1);
+ Map<String,Object> map=new HashMap<>();
+ map.put("list",advicePage.getRecords());
+ map.put("total",advicePage.getTotal());
+// List<TjAdvice> list = tjAdviceService.list(wq1);
+ return AjaxResult.success(map);
+ }
+
+
+
+
+ @GetMapping("/getAdviceByTjNumAndPro")
+ @ApiOperation(value = "鏍规嵁椤圭洰id鍜屼綋妫�鍙疯幏鍙栧缓璁�")
+ public AjaxResult getAdviceByTjNumAndPro(@ApiParam(value = "鐖堕」鐩」鐩甶d") @RequestParam String proId,
+ @ApiParam(value = "浣撴鍙�") @RequestParam String tjNum) {
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getProId, proId);
+ wq.eq(TjOrderRemark::getTjNumber,tjNum);
+ TjOrderRemark remark = remarkService.getOne(wq);
+ List<TjAdvice> list =null;
+ if (null != remark && !StringUtils.isBlank(remark.getSummary())) {
+ String[] strings = StringUtils.split(remark.getSummary(), ";");
+ if(null !=strings && strings.length>0){
+ list = tjAdviceService.getAdviceStringByIds(strings);
+ }
}
return AjaxResult.success(list);
}
+
+
/**
* 鑾峰彇閮ㄩ棬鏍戝垪琛�
*/
--
Gitblit v1.8.0