From 53d149f491dba554ee035599059a1bf65ea92df2 Mon Sep 17 00:00:00 2001 From: zhaowenxuan <chacca165@163.com> Date: 星期三, 12 二月 2025 17:36:13 +0800 Subject: [PATCH] 增加手动同步lis接口 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java | 186 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 144 insertions(+), 42 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java index a2eb643..4271cb5 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java @@ -1,12 +1,12 @@ package com.ltkj.web.controller.system; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.math.BigDecimal; +import java.util.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.ltkj.framework.config.MatchUtils; import com.ltkj.hosp.domain.*; import com.ltkj.hosp.service.*; import io.swagger.annotations.Api; @@ -48,6 +48,8 @@ private ITjGroupingProService groupingProService; @Resource private ITjProjectService projectService; + @Resource + private TjProGzjyService proGzjyService; /** * 鏌ヨ瑙勫垯+鐥呯鍒楄〃 @@ -57,34 +59,34 @@ @ApiOperation(value = "鏌ヨ瑙勫垯+鐥呯鍒楄〃") public TableDataInfo list(TjRules tjRules) { startPage(); - LambdaQueryWrapper<TjRules> wq=new LambdaQueryWrapper<>(); - if (tjRules.getProId()!=null){ - wq.eq(TjRules::getProId,tjRules.getProId()); + LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>(); + if (tjRules.getProId() != null) { + wq.eq(TjRules::getProId, tjRules.getProId()); } - if (tjRules.getProName()!=null){ - wq.like(TjRules::getProName,tjRules.getProName()); + if (tjRules.getProName() != null) { + wq.like(TjRules::getProName, tjRules.getProName()); } - if (tjRules.getRuleType()!=null){ - wq.eq(TjRules::getRuleType,tjRules.getRuleType()); + if (tjRules.getRuleType() != null) { + wq.eq(TjRules::getRuleType, tjRules.getRuleType()); } - if (tjRules.getRuleStr()!=null){ - wq.like(TjRules::getRuleStr,tjRules.getRuleStr()); + if (tjRules.getRuleStr() != null) { + wq.like(TjRules::getRuleStr, tjRules.getRuleStr()); } - if (tjRules.getBingzhong()!=null){ - wq.like(TjRules::getBingzhong,tjRules.getBingzhong()); + if (tjRules.getBingzhong() != null) { + wq.like(TjRules::getBingzhong, tjRules.getBingzhong()); } - if (tjRules.getBzPinyin()!=null){ - wq.like(TjRules::getBzPinyin,tjRules.getBzPinyin()); + if (tjRules.getBzPinyin() != null) { + wq.like(TjRules::getBzPinyin, tjRules.getBzPinyin()); } - if (tjRules.getSex()!=null){ - wq.eq(TjRules::getSex,tjRules.getSex()); + if (tjRules.getSex() != null) { + wq.eq(TjRules::getSex, tjRules.getSex()); } wq.orderByAsc(TjRules::getSort); List<TjRules> list = tjRulesService.list(wq); - if (list!=null){ + if (list != null) { for (TjRules rules : list) { - LambdaQueryWrapper<TjRuleAdvice> wq1=new LambdaQueryWrapper<>(); - wq1.eq(TjRuleAdvice::getBz,rules.getAid()); + LambdaQueryWrapper<TjRuleAdvice> wq1 = new LambdaQueryWrapper<>(); + wq1.eq(TjRuleAdvice::getBz, rules.getAid()); final List<TjRuleAdvice> list1 = tjRuleAdviceService.list(wq1); rules.setRuleAdvices(list1); } @@ -103,22 +105,22 @@ @ApiParam(value = "浣撴鍙�") @RequestParam String ruleStr) { TjOrder one = orderService.getOrderByTjNum(tjNumber); TjCustomer customer = customerService.getById(one.getUserId()); - LambdaQueryWrapper<TjRules> wq=new LambdaQueryWrapper<>(); - if (proId!=null){ - wq.eq(TjRules::getProId,proId); + LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>(); + if (proId != null) { + wq.eq(TjRules::getProId, proId); } - if (ruleStr!=null){ - wq.like(TjRules::getRuleStr,ruleStr); + if (ruleStr != null) { + wq.like(TjRules::getRuleStr, ruleStr); } - if (customer.getCusSex()!=null){ - wq.eq(TjRules::getSex,customer.getCusSex()); + if (customer.getCusSex() != null) { + wq.eq(TjRules::getSex, customer.getCusSex()); } wq.orderByAsc(TjRules::getSort); List<TjRules> list = tjRulesService.list(wq); - if (list!=null){ + if (list != null) { for (TjRules rules : list) { - LambdaQueryWrapper<TjRuleAdvice> wq1=new LambdaQueryWrapper<>(); - wq1.eq(TjRuleAdvice::getBz,rules.getAid()); + LambdaQueryWrapper<TjRuleAdvice> wq1 = new LambdaQueryWrapper<>(); + wq1.eq(TjRuleAdvice::getBz, rules.getAid()); final List<TjRuleAdvice> list1 = tjRuleAdviceService.list(wq1); rules.setRuleAdvices(list1); } @@ -134,21 +136,21 @@ @PostMapping("/export") @ApiOperation(value = "瀵煎嚭瑙勫垯+鐥呯鍒楄〃") public void export(HttpServletResponse response, TjRules tjRules) { - LambdaQueryWrapper<TjRules> wq=new LambdaQueryWrapper<>(); - if (tjRules.getProName()!=null){ - wq.like(TjRules::getProName,tjRules.getProName()); + LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>(); + if (tjRules.getProName() != null) { + wq.like(TjRules::getProName, tjRules.getProName()); } - if (tjRules.getRuleType()!=null){ - wq.eq(TjRules::getRuleType,tjRules.getRuleType()); + if (tjRules.getRuleType() != null) { + wq.eq(TjRules::getRuleType, tjRules.getRuleType()); } - if (tjRules.getBingzhong()!=null){ - wq.like(TjRules::getBingzhong,tjRules.getBingzhong()); + if (tjRules.getBingzhong() != null) { + wq.like(TjRules::getBingzhong, tjRules.getBingzhong()); } - if (tjRules.getBzPinyin()!=null){ - wq.like(TjRules::getBzPinyin,tjRules.getBzPinyin()); + if (tjRules.getBzPinyin() != null) { + wq.like(TjRules::getBzPinyin, tjRules.getBzPinyin()); } - if (tjRules.getSex()!=null){ - wq.eq(TjRules::getSex,tjRules.getSex()); + if (tjRules.getSex() != null) { + wq.eq(TjRules::getSex, tjRules.getSex()); } List<TjRules> list = tjRulesService.list(wq); ExcelUtil<TjRules> util = new ExcelUtil<TjRules>(TjRules.class); @@ -200,4 +202,104 @@ } return toAjax(true); } + + /** + * 瑙勫垯鑷姩璁$畻 + */ + @GetMapping("/AutoGetRule") + @ApiOperation(value = "瑙勫垯鑷姩璁$畻") + public AjaxResult AutoGetRule(@ApiParam(value = "椤圭洰") @RequestParam String proId, + @ApiParam(value = "瀹㈡埛") @RequestParam(required = false) String cusId, + @ApiParam(value = "浣撴鍙�")@RequestParam String tjNum, + @ApiParam(value = "鍏抽敭瀛�") @RequestParam(required = false) String keyWord, + @ApiParam(value = "缁撴灉鍊�") @RequestParam(required = false) String keyNum) { + + TjProject project = projectService.getById(proId); + TjOrder order = orderService.getOrderByTjNum(tjNum); + if(null !=project && null !=order){ + TjProject pproject = projectService.getById(project.getProParentId()); + List<Map<String, Object>> tjproGzJy = projectService.getTjproGzJy(tjNum, proId, keyNum, 0); + if(null !=tjproGzJy && !tjproGzJy.isEmpty()){ +// proGzjyService.remove(new LambdaQueryWrapper<TjProGzjy>().eq(TjProGzjy::getProId,proId).eq(TjProGzjy::getTjNumber,tjNum)); + proGzjyService.deletedByTjNumAndProId(proId,tjNum); + for (Map<String, Object> map : tjproGzJy) { + Object bz = map.get("bz"); + Object bt = map.get("bt"); + Object nr = map.get("nr"); + TjProGzjy proGzjy=new TjProGzjy(); + proGzjy.setTjNumber(tjNum); + proGzjy.setOrderId(order.getOrderId()); + proGzjy.setProId(Long.valueOf(proId)); + proGzjy.setProName(project.getProName()); + proGzjy.setProPrentId(project.getProParentId()); + proGzjy.setProPrentName(pproject.getProName()); + proGzjy.setProJgz(keyNum); + if(null !=bz)proGzjy.setBz(bz.toString()); + if(null !=bt)proGzjy.setBt(bt.toString()); + if(null !=nr)proGzjy.setJy(nr.toString()); + proGzjyService.save(proGzjy); + } + } + return AjaxResult.success(tjproGzJy); + } + return AjaxResult.success(); + } + + //涔嬪墠瑙勫垯绠楁硶鏂规硶 + private AjaxResult getAjaxResult(String proId, String cusId, String keyWord, BigDecimal keyNum) { + List<TjRules> res = new ArrayList<>(); + if (proId ==null){ + return AjaxResult.success(res); + } + if (cusId ==null){ + return AjaxResult.success(res); + } + TjCustomer byId = customerService.getById(cusId); + if(byId==null){ + return AjaxResult.success(res); + } + LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>(); + wq.eq(TjRules::getProId, proId); + wq.lt(TjRules::getAgeLt, MatchUtils.getAgeByIdCard(byId.getCusIdcard())); + wq.gt(TjRules::getAgeGt, MatchUtils.getAgeByIdCard(byId.getCusIdcard())); +// wq.in(TjRules::getSex, 0, byId.getCusSex()); + final List<TjRules> list = tjRulesService.list(wq); + if (list==null){ + return AjaxResult.success(res); + } + for (TjRules tjRules : list) { + //鍒ゆ柇瑙勫垯绫诲瀷:鏁板��/鏂囧瓧 + if ("2".equals(tjRules.getRuleType())) { + + if (new BigDecimal(0).equals(tjRules.getRuleLt()) && new BigDecimal(0).equals(tjRules.getRuleGt())) { + res.add(tjRules); + } else { + if (keyNum != null) { + if (tjRules.getRuleLt().compareTo(keyNum) < 0 && tjRules.getRuleGt().compareTo(keyNum) > 0) { + res.add(tjRules); + } + } + } + } else if ("1".equals(tjRules.getRuleType())) { + if (keyWord !=null){ + if (tjRules.getRuleStr().contains(keyWord)) { + res.add(tjRules); + } + } + + } + } + if (!res.isEmpty()) { + //寤鸿璧嬪�� + for (TjRules re : res) { + LambdaQueryWrapper<TjRuleAdvice> wq1 = new LambdaQueryWrapper<>(); + wq1.eq(TjRuleAdvice::getBz, re.getAid()); + final List<TjRuleAdvice> list1 = tjRuleAdviceService.list(wq1); + re.setRuleAdvices(list1); + } + } + return AjaxResult.success(res); + } + + } -- Gitblit v1.8.0