From 0d0e4d01652499b722d655f3bd0e64a6b0bf6359 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 09 七月 2025 15:21:31 +0800
Subject: [PATCH] zjh20250709
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java | 5 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java | 6 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java | 27 ++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallCategoryController.java | 12 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 69 +++-------------
ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml | 19 ++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 40 +++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallKeywordController.java | 12 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 16 ++--
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java | 5 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java | 6 +
12 files changed, 140 insertions(+), 79 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallCategoryController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallCategoryController.java
index 2028eba..7fc1662 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallCategoryController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallCategoryController.java
@@ -40,7 +40,7 @@
/**
* 鏌ヨ绫荤洰鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('mall:category:list')")
+// @PreAuthorize("@ss.hasPermi('mall:category:list')")
@GetMapping("/list")
@ApiOperation(value = "鏌ヨ绫荤洰鍒楄〃")
public TableDataInfo list(MallCategory mallCategory) {
@@ -52,7 +52,7 @@
/**
* 瀵煎嚭绫荤洰鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('mall:category:export')")
+// @PreAuthorize("@ss.hasPermi('mall:category:export')")
@Log(title = "绫荤洰", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, MallCategory mallCategory) {
@@ -65,7 +65,7 @@
* 鑾峰彇绫荤洰璇︾粏淇℃伅
*/
@ApiOperation(value = "鑾峰彇绫荤洰璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('mall:category:query')")
+// @PreAuthorize("@ss.hasPermi('mall:category:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(mallCategoryService.selectMallCategoryById(id));
@@ -75,7 +75,7 @@
* 鏂板绫荤洰
*/
@ApiOperation(value = "鏂板绫荤洰")
- @PreAuthorize("@ss.hasPermi('mall:category:add')")
+// @PreAuthorize("@ss.hasPermi('mall:category:add')")
@Log(title = "绫荤洰", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody MallCategory mallCategory) {
@@ -86,7 +86,7 @@
* 淇敼绫荤洰
*/
@ApiOperation(value = "淇敼绫荤洰")
- @PreAuthorize("@ss.hasPermi('mall:category:edit')")
+// @PreAuthorize("@ss.hasPermi('mall:category:edit')")
@Log(title = "绫荤洰", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody MallCategory mallCategory) {
@@ -97,7 +97,7 @@
* 鍒犻櫎绫荤洰
*/
@ApiOperation(value = "鍒犻櫎绫荤洰")
- @PreAuthorize("@ss.hasPermi('mall:category:remove')")
+// @PreAuthorize("@ss.hasPermi('mall:category:remove')")
@Log(title = "绫荤洰", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallKeywordController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallKeywordController.java
index df62e96..91354db 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallKeywordController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallKeywordController.java
@@ -37,7 +37,7 @@
/**
* 鏌ヨ鍏抽敭瀛楀垪琛�
*/
- @PreAuthorize("@ss.hasPermi('mall:keyword:list')")
+// @PreAuthorize("@ss.hasPermi('mall:keyword:list')")
@GetMapping("/list")
public TableDataInfo list(MallKeyword mallKeyword) {
startPage();
@@ -48,7 +48,7 @@
/**
* 瀵煎嚭鍏抽敭瀛楀垪琛�
*/
- @PreAuthorize("@ss.hasPermi('mall:keyword:export')")
+// @PreAuthorize("@ss.hasPermi('mall:keyword:export')")
@Log(title = "鍏抽敭瀛�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, MallKeyword mallKeyword) {
@@ -60,7 +60,7 @@
/**
* 鑾峰彇鍏抽敭瀛楄缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('mall:keyword:query')")
+// @PreAuthorize("@ss.hasPermi('mall:keyword:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(mallKeywordService.selectMallKeywordById(id));
@@ -69,7 +69,7 @@
/**
* 鏂板鍏抽敭瀛�
*/
- @PreAuthorize("@ss.hasPermi('mall:keyword:add')")
+// @PreAuthorize("@ss.hasPermi('mall:keyword:add')")
@Log(title = "鍏抽敭瀛�", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody MallKeyword mallKeyword) {
@@ -79,7 +79,7 @@
/**
* 淇敼鍏抽敭瀛�
*/
- @PreAuthorize("@ss.hasPermi('mall:keyword:edit')")
+// @PreAuthorize("@ss.hasPermi('mall:keyword:edit')")
@Log(title = "鍏抽敭瀛�", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody MallKeyword mallKeyword) {
@@ -89,7 +89,7 @@
/**
* 鍒犻櫎鍏抽敭瀛�
*/
- @PreAuthorize("@ss.hasPermi('mall:keyword:remove')")
+// @PreAuthorize("@ss.hasPermi('mall:keyword:remove')")
@Log(title = "鍏抽敭瀛�", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index d7f1e2e..ab1f44c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -14,6 +14,7 @@
import com.ltkj.common.annotation.RepeatSubmit;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.core.domain.entity.SysDept;
+import com.ltkj.common.core.domain.entity.SysRole;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.enums.DataSourceType;
@@ -1130,7 +1131,8 @@
@ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
@ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
@ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime,
- @ApiParam(value = "浣撴绫诲瀷") @RequestParam(required = false) String tjCategory) {
+ @ApiParam(value = "浣撴绫诲瀷") @RequestParam(required = false) String tjCategory,
+ @ApiParam(value = "浣撴绫诲瀷") @RequestParam(required = false) String tcm) {
// String config = configService.selectConfigByKey("tj_confirm");
// DateTime beginTimes = null;
// DateTime endTimes = null;
@@ -1227,7 +1229,7 @@
if (name == null) name = "";
if (beginTime == null) beginTime = "";
if (endTime == null) endTime = "";
- return AjaxResult.success(orderService.getCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name,tjCategory));
+ return AjaxResult.success(orderService.getCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name,tjCategory,tcm));
}
@@ -2221,4 +2223,38 @@
}
+
+ @GetMapping("/getRsjList")
+ @ApiOperation(value = "鎬绘妫�鏌ヤ簩涓夌骇鏌ヨ鎺ュ彛")//0寰�1宸�
+// @PreAuthorize("@ss.hasPermi('check:check:getList')")
+ public AjaxResult getRsjList(@ApiParam(value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam(required = false) Integer checkStatus,
+ @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @ApiParam(value = "浣撴鍗曞彿") @RequestParam(required = false) String tjNumber,
+ @ApiParam(value = "鍗曚綅") @RequestParam(required = false) Long compId,
+ @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
+ @ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
+ @ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime,
+ @ApiParam(value = "浣撴绫诲瀷") @RequestParam(required = false) String tjCategory,
+ @ApiParam(value = "浣撴绫诲瀷") @RequestParam(required = false) String tcm) {
+
+ List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+ String type = "0";
+ if (null != roles && !roles.isEmpty()) {
+ List<SysRole> erji = roles.stream().filter(item -> item.getRoleName().contains("浜岀骇瀹℃牳")).collect(Collectors.toList());
+ List<SysRole> sanji = roles.stream().filter(item -> item.getRoleName().contains("涓夌骇瀹℃牳")).collect(Collectors.toList());
+ if (!erji.isEmpty()) type="2";
+ if (!sanji.isEmpty()) type="3";
+ }
+
+ String value = String.valueOf(compId);
+ if (tjNumber == null) tjNumber = "";
+ if (compId == null) value = "";
+ if (name == null) name = "";
+ if (beginTime == null) beginTime = "";
+ if (endTime == null) endTime = "";
+ return AjaxResult.success(orderService.getEsjCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value,
+ beginTime, endTime, name,tjCategory,tcm,type));
+ }
+
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index 1592fd9..7244ec4 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -493,24 +493,24 @@
if(sfjysfzh.equalsIgnoreCase("Y")){
if(cusIdcard.length()==18){
b = MatchUtils.isIdCard(cusIdcard);
+ }else {
+ return AjaxResult.error("璇疯緭鍏ュ崄鍏綅鍙风殑璇佷欢鍙�!");
}
}
}
-// else {
-// if(cusIdcard.length()==9){
-// b = MatchUtils.cardValidate(cusIdcard, tjCustomer.getIdType());
-// }
-//
-// }
} else {
return AjaxResult.error("璇烽�夋嫨璇佷欢绫诲瀷");
}
- if (!b) return AjaxResult.error("璇佷欢鍙锋湁璇�");
+ if (!b) return AjaxResult.error("璇佷欢鍙锋湁璇�,璇锋鏌ヨ瘉浠跺彿鏄惁鏈夋晥!");
+
//鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝ｇ‘
+ if (tjCustomer.getCusPhone().length() != 11)
+ return AjaxResult.error("璇疯緭鍏ュ崄涓�浣嶅彿鐨勬墜鏈哄彿!");
+
if(sfjysjh.equalsIgnoreCase("Y")){
if (!(MatchUtils.isMobileNO(tjCustomer.getCusPhone())))
- return AjaxResult.error("鎵嬫満鍙烽敊璇�");
+ return AjaxResult.error("鎵嬫満鍙烽敊璇�,璇锋鏌ユ墜鏈哄彿鏄惁鏈夋晥!");
}
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
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 b8777f9..2403675 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
@@ -482,7 +482,8 @@
TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
if (null != tjCustomer) {
order.setTjCustomerSex(tjCustomer.getCusSex());
- order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
+ if(null !=tjCustomer.getCusBrithday())
+ order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setTjCustomerName(tjCustomer.getCusName());
order.setTjCustomerPhone(tjCustomer.getCusPhone());
order.setTjCusIdCard(tjCustomer.getCusIdcard());
@@ -549,7 +550,8 @@
TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
if (null != tjCustomer) {
order.setTjCustomerSex(tjCustomer.getCusSex());
- order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
+ if(null !=tjCustomer.getCusBrithday())
+ order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setTjCustomerName(tjCustomer.getCusName());
order.setTjCustomerPhone(tjCustomer.getCusPhone());
order.setTjCusIdCard(tjCustomer.getCusIdcard());
@@ -1771,16 +1773,11 @@
ExecutorService threadPools = Executors.newFixedThreadPool(cusIds.size());
for (String cusId : cusIds) {
-// threadPools.execute(new Runnable() {
-// @Override
-// public void run() {
try {
getAjaxResults(cusId);
} catch (Exception e) {
}
-// }
-// });
}
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
wq.in(TjCustomer::getCusIdcard, cusIds);
@@ -1789,18 +1786,6 @@
// ExecutorService threadPool = Executors.newFixedThreadPool(list.size());
ThreadPoolTaskExecutor executor = threadPoolConfig.threadPoolTaskExecutor();
for (Long aLong : list) {
-// threadPool.execute(new Runnable() {
-// @Override
-// public void run() {
-// try {
-// AjaxResult result = getAjaxResult(aLong, sysUser, daoDto.getTjCategory());
-// threadPool.shutdown();
-// } catch (IOException e) {
-// e.printStackTrace();
-// }
-// }
-// });
-
Future<AjaxResult> future = executor.submit(new Callable<AjaxResult>() {
@Override
public AjaxResult call() throws Exception {
@@ -2012,14 +1997,6 @@
if (tjReservation != null) {
tjOrder.setReservationId(tjReservation.getId());
mallOrder = mallOrderService.getOne(new LambdaQueryWrapper<MallOrder>().eq(MallOrder::getReservationId, tjReservation.getId()));
-// if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
-// return AjaxResult.error("鏈埌棰勭害鏃堕棿");
-// }
-// if (DateUtil.endOfDay(tjReservation.getReservationTime()).before(new Date())) {
-// tjReservation.setIsExpire(1);
-// tjReservationService.updateById(tjReservation);
-// return AjaxResult.error("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�");
-// }
if (null != tjReservation.getTeamNo()) tjOrder.setTeamNo(tjReservation.getTeamNo());
if (null != tjReservation.getCompanyId()) tjOrder.setFirmId(tjReservation.getCompanyId());
if (null != tjReservation.getCompany()) tjOrder.setFirmName(tjReservation.getCompany());
@@ -2042,39 +2019,18 @@
if (StringUtil.isBlank(tjOrder.getFirmId())) {
tjOrder.setFirmId("0");
}
-//
-// tjReservation.setIsExpire(1);
-// tjReservationService.updateById(tjReservation);
-
- //鐢熸垚浣撴鍙�
-// String tjNumber = (sysUser.getUserName() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
-// tjNumber = tjNumber.replaceAll(".{6}$", userId.toString().substring(userId.toString().length() - 6));
//鑾峰彇鎷兼帴鍓嶇紑
- String makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix");
-// String tjNumber = (sysUser.getUserName() + idUtils.getTjNumber());
-// String tjNumber = idUtils.getTjNumber();
+ String sfkqtjhqz = configService.selectConfigByKey("sfkqtjhqz");
+ String makeLisTmhPrefix = "";
+ if(sfkqtjhqz.equalsIgnoreCase("Y")){
+ makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix");
+ }
+
String tjNumber = idUtils.getNewTjNumberRedisLockAndMysql();
if (StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber = makeLisTmhPrefix + tjNumber;
-
-// if (redisCache.hasKey(TJH)) {
-// while (true){
-// List<String> tjh = redisCache.getCacheList(TJH);
-// if(tjh.contains(tjNumber)){
-// tjNumber =(sysUser.getUserName() + IdUtils.getTjNumber());
-// if (StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber = makeLisTmhPrefix + tjNumber;
-// }else {
-// tjh.add(tjNumber);
-// }
-// }
-// }else {
-// List<String> stringList = tjOrderService.
-// list(new LambdaQueryWrapper<TjOrder>().select(TjOrder::getTjNumber)).stream().map(TjOrder::getTjNumber).collect(Collectors.toList());
-// stringList.add(tjNumber);
-// redisCache.setCacheList(TJH,stringList);
-// }
tjOrder.setTjNumber(tjNumber);
if (null != tjOrder.getPhoto()) {
File file = new File(tjOrder.getPhoto());
@@ -4111,8 +4067,11 @@
@GetMapping(value = "newgetTransitionList")
@ApiOperation(value = "鏈�鏂版煡璇㈣繃娓¤〃鏁版嵁")
public AjaxResult newgetTransitionList(@RequestParam @ApiParam(value = "瀹㈡埛id") String cusId) {
+ Map<String, Object> map = new HashMap<>();
List<TbTransition> list = transitionService.newgetTransitionList(cusId);
- return AjaxResult.success(list);
+ map.put("list", list);
+ map.put("tjCategory", transitionService.getTjCategoryByTbTransition(cusId));
+ return AjaxResult.success(map);
}
@PostMapping(value = "updateTransitionnewPrice")
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 7eff9b1..170286d 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
@@ -410,4 +410,10 @@
"trim(g.pro_id)=trim(aa.parent_pro_id ) where g.pac_id=#{pacId} AND (g.price_now-aa.ys)>0;")
List<Map<String,Object>> addTbhuoquxiangmuchajia(@Param("pacId") String pacId, @Param("cusIdCard") String cusIdCard);
+
+
+ @Select("SELECT DISTINCT b.tj_category FROM tb_transition a JOIN tj_package b ON b.pac_id=a.pac_id " +
+ "WHERE a.cus_id=#{cusIdCard} AND ISNULL(a.tj_num)")
+ String getTjCategoryByTbTransition(String cusIdCard);
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
index 681bbd1..dd93ba0 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -431,4 +431,9 @@
@Select("SELECT count(*) FROM tj_order WHERE tj_number = #{tjNum}")
int getOrderCountByTjNum(String tjNum);
+
+
+
+ //瀛樺偍杩囩▼涓撶敤鎺ュ彛(鎬绘)
+ List<List<?>> getEsjCunChuGuoChengCustomerList(Map<String,Object> map);
}
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 d9ab519..4e267d3 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
@@ -156,4 +156,6 @@
BigDecimal getTbTransitionNewPriceByTjNumAndParentId(String tjNum, String proId);
BigDecimal getTbTransitionOrdPriceByTjNumAndParentId(String tjNum, String proId);
+
+ String getTjCategoryByTbTransition(String cusIdCard);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
index fc1a41a..bc71a77 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -126,7 +126,7 @@
//瀛樺偍杩囩▼涓撶敤鎺ュ彛(鎬绘)
Map<String,Object> getCunChuGuoChengCustomerList(String tjNumber,Integer page,Integer pageSize,
- Integer checkStatus, String compId, String beginTime, String endTime,String tjname,String tjCategory);
+ Integer checkStatus, String compId, String beginTime, String endTime,String tjname,String tjCategory,String tcm);
//瀛樺偍杩囩▼涓撶敤鎺ュ彛(鍒濆)
Map<String,Object> getCsCunChuGuoChengCustomerList(String tjNumber,Integer page,Integer pageSize,
@@ -197,4 +197,8 @@
//瀛樺偍杩囩▼涓撶敤鎺ュ彛(鍒濆)
Map<String,Object> getYxJcList(Integer checkStatus ,String tjNumber,Integer page,Integer pageSize,
String compId, String beginTime, String endTime,String tjname,String tcm,String deptId);
+
+ Map<String,Object> getEsjCunChuGuoChengCustomerList(String tjNumber, Integer page, Integer pageSize, Integer checkStatus,
+ String value, String beginTime, String endTime, String name, String tjCategory, String tcm, String type);
+
}
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 d25b607..68965c5 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
@@ -270,4 +270,9 @@
public BigDecimal getTbTransitionOrdPriceByTjNumAndParentId(String tjNum, String proId) {
return tbTransitionMapper.getTbTransitionOrdPriceByTjNumAndParentId(tjNum,proId);
}
+
+ @Override
+ public String getTjCategoryByTbTransition(String cusIdCard) {
+ return tbTransitionMapper.getTjCategoryByTbTransition(cusIdCard);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
index 89b2d7e..254b383 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -226,7 +226,7 @@
@Override
public Map<String,Object> getCunChuGuoChengCustomerList(String tjNumber, Integer page, Integer pageSize, Integer checkStatus,
- String compId, String beginTime, String endTime, String tjname,String tjCategory) {
+ String compId, String beginTime, String endTime, String tjname,String tjCategory,String tcm) {
Map<String, Object> map = new HashMap<>();
map.put("checkStatus",checkStatus);
@@ -238,6 +238,7 @@
map.put("beginTime",beginTime);
map.put("endTime",endTime);
map.put("p_tjCategory",tjCategory);
+ map.put("tcm",tcm);
List<List<?>> list = tjOrderMapper.getCunChuGuoChengCustomerList(map);
Map<String,Object> map1=new HashMap<>();
map1.put("customers",list);
@@ -484,4 +485,28 @@
map1.put("total",map.get("total"));
return map1;
}
+
+ @Override
+ public Map<String,Object> getEsjCunChuGuoChengCustomerList(String tjNumber, Integer page, Integer pageSize,
+ Integer checkStatus, String compId, String beginTime, String endTime, String tjname,
+ String tjCategory, String tcm,String type) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("checkStatus",checkStatus);
+ map.put("page",page);
+ map.put("pageSize",pageSize);
+ map.put("tjNumber",tjNumber);
+ map.put("compId",compId);
+ map.put("tjname",tjname);
+ map.put("beginTime",beginTime);
+ map.put("endTime",endTime);
+ map.put("p_tjCategory",tjCategory);
+ map.put("tcm",tcm);
+ map.put("type",type);
+ List<List<?>> list = tjOrderMapper.getEsjCunChuGuoChengCustomerList(map);
+ Map<String,Object> map1=new HashMap<>();
+ map1.put("customers",list);
+ map1.put("total",map.get("total"));
+
+ return map1;
+ }
}
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
index 8fce5c6..45abcd1 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
@@ -365,6 +365,7 @@
#{beginTime,mode=IN,jdbcType=VARCHAR},
#{endTime,mode=IN,jdbcType=VARCHAR},
#{p_tjCategory,mode=IN,jdbcType=VARCHAR},
+ #{tcm,mode=IN,jdbcType=VARCHAR},
#{total,mode=OUT,jdbcType=INTEGER}
)}
</select>
@@ -459,4 +460,22 @@
)}
</select>
+
+ <select id="getEsjCunChuGuoChengCustomerList" parameterType="java.util.Map" statementType="CALLABLE" resultType="java.util.Map">
+ {call tj_esjcheck_list(
+ #{checkStatus,mode=IN,jdbcType=INTEGER},
+ #{page,mode=IN,jdbcType=INTEGER},
+ #{pageSize,mode=IN,jdbcType=INTEGER},
+ #{tjNumber,mode=IN,jdbcType=VARCHAR},
+ #{compId,mode=IN,jdbcType=VARCHAR},
+ #{tjname,mode=IN,jdbcType=VARCHAR},
+ #{beginTime,mode=IN,jdbcType=VARCHAR},
+ #{endTime,mode=IN,jdbcType=VARCHAR},
+ #{p_tjCategory,mode=IN,jdbcType=VARCHAR},
+ #{tcm,mode=IN,jdbcType=VARCHAR},
+ #{type,mode=IN,jdbcType=VARCHAR},
+ #{total,mode=OUT,jdbcType=INTEGER}
+ )}
+ </select>
+
</mapper>
--
Gitblit v1.8.0