From 769f5f1c452560ab044fee905c1c514c9ca373bb Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 10 七月 2025 17:45:13 +0800
Subject: [PATCH] zjh20250710
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 367 +++++++++++++++++++++++++++++++++------------------
1 files changed, 235 insertions(+), 132 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 2230d62..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;
@@ -47,7 +48,9 @@
import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.NoTransactionException;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -89,11 +92,7 @@
@Resource
private ITjOrderRemarkService orderRemarkService;
@Resource
- private ITbTransitionService transitionService;
- @Resource
private ISysUserService userService;
- @Resource
- private RedisCache redisCache;
@Resource
private TjAsyncService asyncService;
@Resource
@@ -104,12 +103,6 @@
private ISysDeptService deptService;
@Resource
private TestMapper testMapper;
- @Resource
- private TjvLtkjvtjpatService tjvLtkjvtjpatService;
- @Resource
- private LtkjMiddleDetailService middleDetailService;
- @Resource
- private LtkjMiddleHeadService headService;
@Resource
private LtkjExamJcbgdService jcbgdService;
@Resource
@@ -135,11 +128,7 @@
@Autowired
private SysConfigController configController;
@Autowired
- private TjJcycxmService jcycxmService;
- @Resource
- private TjXdtgmdjgService xdtgmdjgService;
- @Resource
- private TjXdPictureController pictureController;
+ private TjReportController reportController;
@GetMapping("/ceshicc")
@ApiOperation(value = "娴嬭瘯璋冪敤瀛樺偍杩囩▼鑰楁椂鎺ュ彛")
@@ -465,15 +454,22 @@
//鍚屾妫�楠�
if (null != baoGaoDans && baoGaoDans.size() > 0) {
Date dates = new Date();
- Map<String, Object> map = new HashMap<>();
- map.put("his_registration_id", order.getCardId());
- map.put("ksbm", "");
- map.put("pationid", "");
- map.put("ksrq", DateUtil.format(DateUtil.beginOfDay(order.getCreateTime()), "yyyy-MM-dd HH:mm:ss"));
- map.put("jsrq", DateUtil.format(DateUtil.endOfDay(dates), "yyyy-MM-dd HH:mm:ss"));
- map.put("pagecount", 10);
- map.put("page", 1);
- AjaxResult result = controller.Getlabreportinfo(map);
+ String jytbfs = configService.selectConfigByKey("jytbfs");
+ AjaxResult result;
+ if (StrUtil.isBlank(jytbfs) || jytbfs.equalsIgnoreCase("Y")){
+ Map<String, Object> map = new HashMap<>();
+ map.put("his_registration_id", order.getCardId());
+ map.put("ksbm", "");
+ map.put("pationid", "");
+ map.put("ksrq", DateUtil.format(DateUtil.beginOfDay(order.getCreateTime()), "yyyy-MM-dd HH:mm:ss"));
+ map.put("jsrq", DateUtil.format(DateUtil.endOfDay(dates), "yyyy-MM-dd HH:mm:ss"));
+ map.put("pagecount", 10);
+ map.put("page", 1);
+ result = controller.Getlabreportinfo(map);
+ }else{
+ result = ltkjHysqdService.getAsyncDataByPro("浣撴涓績", order.getCardId(), "''", 100, 1);
+ }
+
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
@@ -505,68 +501,71 @@
hysqd.setShrxm(jsonObject.getStr("JYYSQM"));
hysqd.setJybgjg(jsonObject.getStr("JYBGJG"));
if (ltkjHysqdService.save(hysqd)) {
- Map<String, Object> hashMap = new HashMap<>();
- hashMap.put("jybgid", hysqd.getTmh());
- AjaxResult bgdres = controller.Getlabdetailinfo(hashMap);
- String result2 = getAjaxResult(bgdres);
- JSONObject object1 = getJSONObject(result2);
- String code1 = object1.getStr("ResultCode");
- if (null != code1 && code1.equals("0")) {
- JSONArray datas = object1.getJSONArray("ResultData");
- for (Object o : datas) {
- JSONObject js = (JSONObject) o;
+ if(StrUtil.isBlank(jytbfs) || jytbfs.equalsIgnoreCase("Y")){
+ Map<String, Object> hashMap = new HashMap<>();
+ hashMap.put("jybgid", hysqd.getTmh());
+ AjaxResult bgdres = controller.Getlabdetailinfo(hashMap);
+ String result2 = getAjaxResult(bgdres);
+ JSONObject object1 = getJSONObject(result2);
+ String code1 = object1.getStr("ResultCode");
+ if (null != code1 && code1.equals("0")) {
+ JSONArray datas = object1.getJSONArray("ResultData");
+ for (Object o : datas) {
+ JSONObject js = (JSONObject) o;
// ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(jsonObject.getStr("JYBGID"));
- LtkjHybgd bgd = new LtkjHybgd();
- bgd.setTmh(hysqd.getTmh());
- bgd.setJcxmid(js.getStr("JCZBDM"));
- bgd.setJcxm(js.getStr("JCZBMC"));
- bgd.setTdh(js.getStr(""));
- bgd.setJyjg(js.getStr("JCZBJG"));
- bgd.setJgdw(js.getStr("JLDW"));
- bgd.setFwzdz(js.getStr(""));
- bgd.setFwzgz(js.getStr(""));
- bgd.setFwz(js.getStr("CKZFW"));
- bgd.setJysj(js.getStr("BGRQ"));
- bgd.setJyys(js.getStr("JCRBH"));
- bgd.setShsj(js.getStr("BGRQ"));
- bgd.setShsj(js.getStr("BGRQ"));
- bgd.setShys(js.getStr("SHRBH"));
- bgd.setShysmc(js.getStr("SHRXM"));
- bgd.setYcbz(js.getStr("YCTS"));
+ LtkjHybgd bgd = new LtkjHybgd();
+ bgd.setTmh(hysqd.getTmh());
+ bgd.setJcxmid(js.getStr("JCZBDM"));
+ bgd.setJcxm(js.getStr("JCZBMC"));
+ bgd.setTdh(js.getStr(""));
+ bgd.setJyjg(js.getStr("JCZBJG"));
+ bgd.setJgdw(js.getStr("JLDW"));
+ bgd.setFwzdz(js.getStr(""));
+ bgd.setFwzgz(js.getStr(""));
+ bgd.setFwz(js.getStr("CKZFW"));
+ bgd.setJysj(js.getStr("BGRQ"));
+ bgd.setJyys(js.getStr("JCRBH"));
+ bgd.setShsj(js.getStr("BGRQ"));
+ bgd.setShsj(js.getStr("BGRQ"));
+ bgd.setShys(js.getStr("SHRBH"));
+ bgd.setShysmc(js.getStr("SHRXM"));
+ bgd.setYcbz(js.getStr("YCTS"));
// bgd.setTpurl(js.getStr(""));
- ltkjHybgdService.save(bgd);
+ ltkjHybgdService.save(bgd);
+ }
}
- }
- Map<String, Object> fbhashMap = new HashMap<>();
- fbhashMap.put("jybgid", hysqd.getTmh());
- AjaxResult fbres = controller.Getlabgermrepinfo(fbhashMap);
- String ajaxResult = getAjaxResult(fbres);
- JSONObject fbobject = getJSONObject(ajaxResult);
- String fbcode = fbobject.getStr("ResultCode");
- if (null != fbcode && fbcode.equals("0")) {
- JSONArray datas = fbobject.getJSONArray("ResultData");
- for (Object o : datas) {
- JSONObject js = (JSONObject) o;
- LtkjHybgd bgd = new LtkjHybgd();
- bgd.setTmh(hysqd.getTmh());
- bgd.setJcxmid(hysqd.getXmid());
- bgd.setJcxm(hysqd.getXmmc());
- bgd.setTdh(js.getStr(""));
- bgd.setJyjg(js.getStr("JCJG"));
- bgd.setJgdw("/");
- bgd.setFwzdz("/");
- bgd.setFwzgz("/");
- bgd.setFwz("/");
- bgd.setJysj(js.getStr("BGRQ"));
- bgd.setJyys(hysqd.getSqrxm());
- bgd.setShsj(js.getStr("BGRQ"));
- bgd.setShys(hysqd.getShrdm());
- bgd.setShysmc(hysqd.getShrxm());
- ltkjHybgdService.save(bgd);
+ Map<String, Object> fbhashMap = new HashMap<>();
+ fbhashMap.put("jybgid", hysqd.getTmh());
+ AjaxResult fbres = controller.Getlabgermrepinfo(fbhashMap);
+ String ajaxResult = getAjaxResult(fbres);
+ JSONObject fbobject = getJSONObject(ajaxResult);
+ String fbcode = fbobject.getStr("ResultCode");
+ if (null != fbcode && fbcode.equals("0")) {
+ JSONArray datas = fbobject.getJSONArray("ResultData");
+ for (Object o : datas) {
+ JSONObject js = (JSONObject) o;
+ LtkjHybgd bgd = new LtkjHybgd();
+ bgd.setTmh(hysqd.getTmh());
+ bgd.setJcxmid(hysqd.getXmid());
+ bgd.setJcxm(hysqd.getXmmc());
+ bgd.setTdh(js.getStr(""));
+ bgd.setJyjg(js.getStr("JCJG"));
+ bgd.setJgdw("/");
+ bgd.setFwzdz("/");
+ bgd.setFwzgz("/");
+ bgd.setFwz("/");
+ bgd.setJysj(js.getStr("BGRQ"));
+ bgd.setJyys(hysqd.getSqrxm());
+ bgd.setShsj(js.getStr("BGRQ"));
+ bgd.setShys(hysqd.getShrdm());
+ bgd.setShysmc(hysqd.getShrxm());
+ ltkjHybgdService.save(bgd);
+ }
}
+ }else {
+ saveHybgdPro(hysqd);
}
-
}
}
//鍚屾鍖栭獙椤圭洰
@@ -779,7 +778,7 @@
map.put("page", 1);
result = controller.Getlabreportinfo(map);
}else {
- result = ltkjHysqdService.getAsyncDataByPro("浣撴涓績", order.getCardId(), "''", 100, 1, "'1'");
+ result = ltkjHysqdService.getAsyncDataByPro("浣撴涓績", order.getCardId(), "''", 100, 1);
}
log.info("妫�楠岄」鐩煡璇㈣繑鍥炲��: " + JSONUtil.toJsonStr(result));
@@ -816,10 +815,18 @@
List<LtkjHysqd> list = ltkjHysqdService.list(queryWrapper);
if (list.isEmpty())
isInsertHysqd = true;
- if (isInsertHysqd) {
- saveHysqd(hysqd);
- } else {
- saveHybgd(hysqd);
+ if(StrUtil.isBlank(jytbfs) || jytbfs.equalsIgnoreCase("Y")){
+ if (isInsertHysqd) {
+ saveHysqd(hysqd);
+ } else {
+ saveHybgd(hysqd);
+ }
+ }else {
+ if (isInsertHysqd) {
+ saveHysqdPro(hysqd);
+ } else {
+ saveHybgdPro(hysqd);
+ }
}
}
} else {
@@ -946,6 +953,12 @@
}
}
+ private void saveHysqdPro(LtkjHysqd hysqd) {
+ if (ltkjHysqdService.save(hysqd)) {
+ saveHybgdPro(hysqd);
+ }
+ }
+
private void saveHybgd(LtkjHysqd hysqd) {
Map<String, Object> hashMap = new HashMap<>();
hashMap.put("jybgid", hysqd.getTmh());
@@ -1017,6 +1030,60 @@
}
}
+ private void saveHybgdPro(LtkjHysqd hysqd) {
+ List<Map<String, Object>> mapList = ltkjHysqdService.getAsyncJybgdByPro(hysqd.getTmh());
+ log.info("usp_his_getlabdetailinfolttj 杩斿洖->\n{}",JSONUtil.toJsonStr(mapList));
+ for (Map<String, Object> map : mapList) {
+ JSONObject js = JSONUtil.parseObj(map);
+ LtkjHybgd bgd = new LtkjHybgd();
+ bgd.setTmh(hysqd.getTmh());
+ bgd.setJcxmid(js.getStr("JCZBDM"));
+ bgd.setJcxm(js.getStr("JCZBMC"));
+ bgd.setTdh(js.getStr(""));
+ bgd.setJyjg(js.getStr("JCZBJG"));
+ bgd.setJgdw(js.getStr("JLDW"));
+ bgd.setFwzdz(js.getStr(""));
+ bgd.setFwzgz(js.getStr(""));
+ bgd.setFwz(js.getStr("CKZFW"));
+ bgd.setJysj(js.getStr("BGRQ"));
+ bgd.setJyys(js.getStr("JCRBH"));
+ bgd.setShsj(js.getStr("BGRQ"));
+ bgd.setShsj(js.getStr("BGRQ"));
+ bgd.setShys(js.getStr("SHRBH"));
+ bgd.setShysmc(js.getStr("SHRXM"));
+ bgd.setYcbz(js.getStr("YCTS"));
+ bgd.setCreateTime(new Date());
+ QueryWrapper<LtkjHybgd> queryWrapper = new QueryWrapper<>(bgd);
+ List<LtkjHybgd> list = ltkjHybgdService.list(queryWrapper);
+ if (list.isEmpty())
+ ltkjHybgdService.save(bgd);
+ }
+ List<Map<String, Object>> mapList1 = ltkjHysqdService.getAsyncJybgdWswByPro(hysqd.getTmh());
+ log.info("usp_his_getlabgermrepinfolttj 杩斿洖->\n{}",JSONUtil.toJsonStr(mapList1));
+ for (Map<String, Object> map : mapList1) {
+ JSONObject js = JSONUtil.parseObj(map);
+ LtkjHybgd bgd = new LtkjHybgd();
+ bgd.setTmh(hysqd.getTmh());
+ bgd.setJcxmid(hysqd.getXmid());
+ bgd.setJcxm(hysqd.getXmmc());
+ bgd.setTdh(js.getStr(""));
+ bgd.setJyjg(js.getStr("JCJG"));
+ bgd.setJgdw("/");
+ bgd.setFwzdz("/");
+ bgd.setFwzgz("/");
+ bgd.setFwz("/");
+ bgd.setJysj(js.getStr("BGRQ"));
+ bgd.setJyys(hysqd.getSqrxm());
+ bgd.setShsj(js.getStr("BGRQ"));
+ bgd.setShys(hysqd.getShrdm());
+ bgd.setShysmc(hysqd.getShrxm());
+ QueryWrapper<LtkjHybgd> queryWrapper = new QueryWrapper<>(bgd);
+ List<LtkjHybgd> list = ltkjHybgdService.list(queryWrapper);
+ if (list.isEmpty())
+ ltkjHybgdService.save(bgd);
+ }
+ }
+
//灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
public JSONObject getJSONObject(String builder) {
String Response = JSONUtil.parseObj(builder).getStr("Response");
@@ -1064,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;
@@ -1161,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));
}
@@ -1286,53 +1354,53 @@
@PutMapping("/getTjdetailList")
@ApiOperation(value = "鏍规嵁浣撴璁㈠崟鍙疯幏鍙栦綋妫�璇︽儏淇℃伅(骞朵慨鏀圭姸鎬�)鎺ュ彛")
// @PreAuthorize("@ss.hasPermi('check:check:getTjdetailList')")
+ @Transactional
public AjaxResult getTjdetailList(@ApiParam(value = "浣撴tjNumber") @RequestParam String tjNumber,
@ApiParam(value = "鎬绘寤鸿") @RequestParam(required = false) String advice,
@ApiParam(value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam Integer checkStatus,
@ApiParam(value = "鑱屼笟缁撹") @RequestParam(required = false) String zhiyeJl,
@ApiParam(value = "鑱屼笟缁撴灉") @RequestParam(required = false) String zhiyeJg) {
- String config = configService.selectConfigByKey("sfjcwjhyqxm");
- if (null != config && config.equalsIgnoreCase("Y")) {
- int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
- if (num > 0) return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
- }
- Date date = new Date();
- if (null != tjNumber) {
- Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
- SysUser sysUser = userService.getById(userId);
- LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjOrder::getTjNumber, tjNumber);
- TjOrder tjOrder = orderService.getOne(wq1);
- if (null != tjOrder) {
- tjOrder.setCheckAdvice(advice);
- tjOrder.setCheckStatus(checkStatus);
- tjOrder.setStatus(TjConstants.TJ_CHECK);
- tjOrder.setCheckDoctor(sysUser.getNickName());
- tjOrder.setCheckTime(date);
- tjOrder.setStatus(401);
- tjOrder.setFinishTime(date);
- if (StrUtil.isNotBlank(zhiyeJl))
- tjOrder.setZhiyeJl(zhiyeJl);
- if (StrUtil.isNotBlank(zhiyeJg))
- tjOrder.setZhiyeJg(zhiyeJg);
- if (orderService.updateById(tjOrder)) {
- TjCustomer customer = customerService.getById(tjOrder.getUserId());
- if (null != customer) {
- customer.setCusNumber(customer.getCusNumber() + 1);
- customer.setCardId("0");
- if (customerService.updateById(customer)) {
- asyncService.updateCheckType(tjNumber);
- return AjaxResult.success("鎿嶄綔鎴愬姛");
- }
- return AjaxResult.error("鎿嶄綔澶辫触");
- }
- }
- return AjaxResult.error("鎿嶄綔澶辫触");
+ try {
+ String config = configService.selectConfigByKey("sfjcwjhyqxm");
+ if (null != config && config.equalsIgnoreCase("Y")) {
+ int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
+ if (num > 0) return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
}
- return AjaxResult.success("鏁版嵁涓嶅瓨鍦�");
+ Date date = new Date();
+ if (null != tjNumber) {
+ Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
+ SysUser sysUser = userService.getById(userId);
+ TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
+ if (null != tjOrder) {
+ tjOrder.setCheckAdvice(advice);
+ tjOrder.setCheckStatus(checkStatus);
+ tjOrder.setStatus(TjConstants.TJ_CHECK);
+ tjOrder.setCheckDoctor(sysUser.getNickName());
+ tjOrder.setCheckTime(date);
+ tjOrder.setStatus(401);
+ tjOrder.setFinishTime(date);
+ if (StrUtil.isNotBlank(zhiyeJl))
+ tjOrder.setZhiyeJl(zhiyeJl);
+ if (StrUtil.isNotBlank(zhiyeJg))
+ tjOrder.setZhiyeJg(zhiyeJg);
+ if (orderService.updateById(tjOrder)) {
+ AjaxResult pdf = reportController.toPdf(tjNumber);
+ if (!pdf.get("code").toString().equals("200") ) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎿嶄綔澶辫触!");
+ }
+ return AjaxResult.success("瀹℃牳骞剁敓鎴愭姤鍛婃垚鍔�!");
+ }
+ return AjaxResult.error("鎿嶄綔澶辫触");
+ }
+ return AjaxResult.success("鏁版嵁涓嶅瓨鍦�");
+ }
+ return AjaxResult.error();
+ } catch (Exception ex) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ throw new RuntimeException(ex);
}
- return AjaxResult.error();
}
@@ -1634,12 +1702,13 @@
if (dels.isEmpty()) {
continue;
}
- dels = dels.stream().sorted(Comparator.comparing(TjOrderDetail::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
- dels = dels.stream()
- .sorted(Comparator.comparingInt(
- tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
- ))
- .collect(Collectors.toList());
+// dels = dels.stream().sorted(Comparator.comparing(TjOrderDetail::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
+// dels = dels.stream()
+// .sorted(Comparator.comparingInt(
+// tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
+// ))
+// .collect(Collectors.toList());
+ dels = dels.stream().sorted(Comparator.comparing(TjOrderDetail::getXh)).collect(Collectors.toList());
parent.put("sons", dels);
parent.put("remark", remark.getRemark());
parent.put("jgbx", remark.getJgbx());
@@ -2154,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));
+ }
+
}
--
Gitblit v1.8.0