From 34161e36b6cbc36dcd10168a90b300691dc2c159 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 15 十二月 2023 20:24:47 +0800
Subject: [PATCH] zjh 2023/12/15--1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java | 4
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java | 27 ++++
ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml | 16 +++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 185 +++++++++++++++++++-----------------
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java | 5 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java | 6 +
6 files changed, 148 insertions(+), 95 deletions(-)
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 7332e0d..071f60c 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
@@ -344,95 +344,102 @@
@ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
@ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime) {
- String config = configService.selectConfigByKey("tj_confirm");
- DateTime beginTimes = null;
- DateTime endTimes = null;
- if (null != beginTime && null != endTime) {
- beginTimes = DateUtil.beginOfDay(DateUtil.parse(beginTime));
- endTimes = DateUtil.endOfDay(DateUtil.parse(endTime));
- }
- asyncService.checkSetCustomerLisByRedis(config);
- //鍒濆鍖栦綋妫�璁㈠崟琛�
- List<TjOrder> orderList = null;
- List<TjCustomer> customerList = new ArrayList<>();
- Map<String, Object> map = new HashMap<>();
-
- //濮撳悕鏌ヨ
- if (null != name && !"".equals(name)) {
- List<TjCustomer> list = customerService.getTjCustomerList(name);
- if (null != list && list.size() > 0) {
- List<TjCustomer> lists = new ArrayList<>();
- for (TjCustomer customer : list) {
- if ("Y".equals(config)) {
- orderList = orderService.getCsTjOrderListByCusId1(customer.getCusId());
- } else {
- orderList = orderService.getTjOrderListByCusId(customer.getCusId());
- }
- if (null != orderList && orderList.size() > 0) {
- for (TjOrder tjOrder : orderList) {
- customer.setTjNumber(tjOrder.getTjNumber());
- customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
- customer.setOrderId(tjOrder.getOrderId());
- customer.setTjTime(tjOrder.getFinishTime());
- customer.setFinishTime(tjOrder.getFinishTime());
- customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
- customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
- customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
- customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
- customer.setTjCategory(tjOrder.getTjCategory());
- if (tjOrder.getFirmId().equals("0")) {
- customer.setTjCompName(null);
- } else {
- customer.setTjCompName(compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId()).getCnName());
- }
- lists.add(customer);
- }
- }
- }
- List<TjCustomer> customers = null;
- if (lists.size() > 0) {
- customers = lists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
- }
- map.put("customers", customers);
- map.put("total", lists.size());
- return AjaxResult.success(map);
- }
- return AjaxResult.success("鏆傛棤鏁版嵁");
- }
-
- //鏉′欢鏌ヨ
- if (null != tjNumber || null != compId || (null != beginTime && null != endTime)) {
- //鍒ゆ柇鏄惁寮�鍚垵瀹�
- if ("Y".equals(config)) {
- orderList = orderService.getCsTjOrderList1(tjNumber, checkStatus, compId, beginTimes, endTimes);
- } else {
- orderList = orderService.getTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
- }
- return getResult(page, pageSize, orderList, customerList, map);
- }
-
- List<TjCustomer> customers = null;
- if (null != checkStatus && checkStatus == 0) {
- customers = redisCache.getCacheMapValue("check", "ws");
- }
- if (null != checkStatus && checkStatus == 1) {
- customers = redisCache.getCacheMapValue("check", "ys");
- }
- if (customers != null && customers.size() > 0) {
-// asyncService.addRedis(customers);
- List<TjCustomer> customerLists = customers.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
- map.put("customers", customerLists);
- map.put("total", customers.size());
- return AjaxResult.success(map);
- } else {
- //鍒ゆ柇鏄惁寮�鍚垵瀹�
- if ("Y".equals(config)) {
- orderList = orderService.getCsTjOrderList1(tjNumber, checkStatus, compId, beginTimes, endTimes);
- } else {
- orderList = orderService.getTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
- }
- return getResult(page, pageSize, orderList, customerList, map);
- }
+// String config = configService.selectConfigByKey("tj_confirm");
+// DateTime beginTimes = null;
+// DateTime endTimes = null;
+// if (null != beginTime && null != endTime) {
+// beginTimes = DateUtil.beginOfDay(DateUtil.parse(beginTime));
+// endTimes = DateUtil.endOfDay(DateUtil.parse(endTime));
+// }
+// asyncService.checkSetCustomerLisByRedis(config);
+// //鍒濆鍖栦綋妫�璁㈠崟琛�
+// List<TjOrder> orderList = null;
+// List<TjCustomer> customerList = new ArrayList<>();
+// Map<String, Object> map = new HashMap<>();
+//
+// //濮撳悕鏌ヨ
+// if (null != name && !"".equals(name)) {
+// List<TjCustomer> list = customerService.getTjCustomerList(name);
+// if (null != list && list.size() > 0) {
+// List<TjCustomer> lists = new ArrayList<>();
+// for (TjCustomer customer : list) {
+// if ("Y".equals(config)) {
+// orderList = orderService.getCsTjOrderListByCusId1(customer.getCusId());
+// } else {
+// orderList = orderService.getTjOrderListByCusId(customer.getCusId());
+// }
+// if (null != orderList && orderList.size() > 0) {
+// for (TjOrder tjOrder : orderList) {
+// customer.setTjNumber(tjOrder.getTjNumber());
+// customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
+// customer.setOrderId(tjOrder.getOrderId());
+// customer.setTjTime(tjOrder.getFinishTime());
+// customer.setFinishTime(tjOrder.getFinishTime());
+// customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
+// customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+// customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
+// customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
+// customer.setTjCategory(tjOrder.getTjCategory());
+// if (tjOrder.getFirmId().equals("0")) {
+// customer.setTjCompName(null);
+// } else {
+// customer.setTjCompName(compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId()).getCnName());
+// }
+// lists.add(customer);
+// }
+// }
+// }
+// List<TjCustomer> customers = null;
+// if (lists.size() > 0) {
+// customers = lists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+// }
+// map.put("customers", customers);
+// map.put("total", lists.size());
+// return AjaxResult.success(map);
+// }
+// return AjaxResult.success("鏆傛棤鏁版嵁");
+// }
+//
+// //鏉′欢鏌ヨ
+// if (null != tjNumber || null != compId || (null != beginTime && null != endTime)) {
+// //鍒ゆ柇鏄惁寮�鍚垵瀹�
+// if ("Y".equals(config)) {
+// orderList = orderService.getCsTjOrderList1(tjNumber, checkStatus, compId, beginTimes, endTimes);
+// } else {
+// orderList = orderService.getTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
+// }
+// return getResult(page, pageSize, orderList, customerList, map);
+// }
+//
+// List<TjCustomer> customers = null;
+// if (null != checkStatus && checkStatus == 0) {
+// customers = redisCache.getCacheMapValue("check", "ws");
+// }
+// if (null != checkStatus && checkStatus == 1) {
+// customers = redisCache.getCacheMapValue("check", "ys");
+// }
+// if (customers != null && customers.size() > 0) {
+//// asyncService.addRedis(customers);
+// List<TjCustomer> customerLists = customers.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+// map.put("customers", customerLists);
+// map.put("total", customers.size());
+// return AjaxResult.success(map);
+// } else {
+// //鍒ゆ柇鏄惁寮�鍚垵瀹�
+// if ("Y".equals(config)) {
+// orderList = orderService.getCsTjOrderList1(tjNumber, checkStatus, compId, beginTimes, endTimes);
+// } else {
+// orderList = orderService.getTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
+// }
+// return getResult(page, pageSize, orderList, customerList, map);
+// }
+ 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.getCunChuGuoChengCustomerList(tjNumber,page,pageSize,checkStatus, value,beginTime,endTime,name));
}
/**
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 56dfb05..93cc83b 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
@@ -5,6 +5,7 @@
import java.util.Map;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.vodomain.LineChartsVo;
import org.apache.ibatis.annotations.Mapper;
@@ -185,4 +186,8 @@
@Select("SELECT * FROM tj_order WHERE deleted='0' and user_id =#{userId}" +
" AND !ISNULL(finish_time) ORDER BY create_time DESC LIMIT 1")
TjOrder getLastTjOrderListByCusId(Long userId);
+
+
+ //瀛樺偍杩囩▼涓撶敤鎺ュ彛
+ List<List<?>> getCunChuGuoChengCustomerList(Map<String,Object> map);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
index 0d20f6b..6c60a6c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
@@ -106,14 +106,14 @@
@Select("SELECT DISTINCT d.* from (\n" +
"\tSELECT * FROM `tj_project` a\n" +
- "\twhere a.pro_parent_id=0 \n" +
+ "\twhere a.pro_parent_id=0 and a.deleted=0 \n" +
"\tand (case WHEN #{proName} is NOt NULL THEN a.pro_name like concat('%',#{proName},'%') ELSE 1=1 END)\n" +
"\tand (case WHEN #{checkType} is NOt NULL THEN a.pro_check_type=#{checkType} ELSE 1=1 END)\n" +
"\tand (case WHEN #{deptId} is NOt NULL THEN a.dept_id=#{deptId} ELSE 1=1 END)\n" +
"UNION \n" +
"\tSELECT b.* FROM `tj_project` b JOIN(\n" +
"\tSELECT * FROM `tj_project` a\n" +
- "\twhere a.pro_parent_id!=0\n" +
+ "\twhere a.pro_parent_id!=0 and a.deleted=0\n" +
"\tand (case WHEN #{proName} is NOt NULL THEN a.pro_name like concat('%',#{proName},'%') ELSE 1=1 END)\n" +
"\tand (case WHEN #{checkType} is NOt NULL THEN a.pro_check_type=#{checkType} ELSE 1=1 END)\n" +
"\tand (case WHEN #{deptId} is NOt NULL THEN a.dept_id=#{deptId} ELSE 1=1 END)\n" +
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 23edc54..910417a 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
@@ -5,6 +5,7 @@
import java.util.Map;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.vodomain.LineChartsVo;
@@ -117,4 +118,9 @@
TjOrder getLastTjOrderListByCusId(Long userId);
+
+
+ //瀛樺偍杩囩▼涓撶敤鎺ュ彛
+ Map<String,Object> getCunChuGuoChengCustomerList(String tjNumber,Integer page,Integer pageSize,
+ Integer checkStatus, String compId, String beginTime, String endTime,String tjname);
}
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 a54d353..c193672 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
@@ -1,10 +1,8 @@
package com.ltkj.hosp.service.impl;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.common.utils.DateUtils;
import com.ltkj.hosp.domain.DictComp;
@@ -221,4 +219,25 @@
public TjOrder getLastTjOrderListByCusId(Long userId) {
return tjOrderMapper.getLastTjOrderListByCusId(userId);
}
+
+ @Override
+ public Map<String,Object> getCunChuGuoChengCustomerList(String tjNumber, Integer page, Integer pageSize, Integer checkStatus,
+ String compId, String beginTime, String endTime, String tjname) {
+
+ 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", DateUtil.beginOfDay(DateUtil.parse(beginTime)));
+ map.put("endTime",DateUtil.beginOfDay(DateUtil.parse(endTime)));
+ List<List<?>> list = tjOrderMapper.getCunChuGuoChengCustomerList(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 4254b29..17968b4 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
@@ -324,4 +324,20 @@
<select id="getOrderList1" parameterType="Integer" resultMap="TjOrderResult">
{call sel_tjorder()}
</select>
+
+
+ <select id="getCunChuGuoChengCustomerList" parameterType="java.util.Map" statementType="CALLABLE" resultType="java.util.Map">
+ {call tj_check_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},
+ #{total,mode=OUT,jdbcType=INTEGER}
+ )}
+ </select>
+
</mapper>
--
Gitblit v1.8.0