From aa98dc5f2e5fb3ffed6a2d4e52070ea1518db1b4 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 03 七月 2025 14:56:06 +0800
Subject: [PATCH] 调整切库日志打印
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 514 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 270 insertions(+), 244 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 2e47633..3710a7c 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
@@ -153,48 +153,50 @@
@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
String userId = SecurityUtils.getLoginUser().getUserId();
- Integer ksId = null;
+ String ksId = null;
SysUser sysUser = null;
if (null != userId) {
sysUser = userService.getById(Long.valueOf(userId));
if (null != sysUser) {
- ksId = Math.toIntExact(sysUser.getDeptId());
+ ksId = sysUser.getDeptId().toString();
}
}
if (ksId == null) {
return AjaxResult.error("璇疯緭鍏ョ瀹d");
}
//鏍规嵁褰撳墠鐧婚檰鐨勪汉鐨勭瀹d锛岃幏鍙栬绉戝涓嬬殑鎵�鏈夐」鐩�
- List<Long> postIds = sysUser.getPostIds();
- List<Long> ksproList = null;
- if (postIds != null) {
- for (Long postId : postIds) {
- LambdaQueryWrapper<SysUserPost> wq111 = new LambdaQueryWrapper<>();
- wq111.eq(SysUserPost::getPostId, postId);
- SysUserPost one = userPostService.getOne(wq111);
- if (one != null) {
- SysPost byId = postService.getById(one.getPostId());
- if (byId.getPostName().equals("褰曞叆鍛�")) {
- ksproList = projectService.getKsTjProjectIdListBydeptId(String.valueOf(ksId));
- }
- }
+
+ String byKey =null;
+
+ SysDept dept = deptService.getById(ksId);
+
+ List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+ if (null != roles && !roles.isEmpty()) {
+ List<SysRole> list = roles.stream().filter(item -> item.getRoleName().contains("鍓嶅彴")).collect(Collectors.toList());
+ if (!list.isEmpty()) {
+ byKey = configService.selectConfigByKey("qt_kjksid");
}
- } else {
- ksproList = projectService.getKsTjProjectIdList();
}
- if (ksproList == null || ksproList.isEmpty()) {
- return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
- }
- List<TjCustomer> customerLis = new ArrayList<>();
if (null == name) name = "";
if (null == tjNumber) tjNumber = "";
Map<String, Object> map = null;
+ if ( StringUtil.isNotBlank(byKey)) {
+ ksId+=(","+byKey);
+ }
+
+ if(null !=dept){
+ if(StringUtil.isNotBlank(dept.getSjks())){
+ ksId+=(","+dept.getSjks());
+ }
+ }
+
+
if (type == 0) {
- map = deptService.getSysDeptYjWjCustomerList13(String.valueOf(ksId), name, tjNumber, 0, page, pageSize);
+ map = deptService.getSysDeptYjWjCustomerList13(ksId, name, tjNumber, 0, page, pageSize);
}
if (type == 1) {
- map = deptService.getSysDeptYjWjCustomerList13(String.valueOf(ksId), name, tjNumber, 1, page, pageSize);
+ map = deptService.getSysDeptYjWjCustomerList13(ksId, name, tjNumber, 1, page, pageSize);
}
return AjaxResult.success(map);
@@ -210,21 +212,11 @@
@ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
-// List<Long> ksproList = null;
-//
-// ksproList = projectService.getHuaYanProId();
-//
-// if (ksproList == null || ksproList.isEmpty()) {
-// return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
-// }
-
Map<String, Object> map = null;
if (type == 0) {
- map = deptService.getSysDeptHyAndYxYjWjCustomerList13("A30", name, tjNumber, 0, page, pageSize);
+ map = deptService.getSysDeptHyAndYxYjWjCustomerList13( name, tjNumber, 0, page, pageSize);
}
- if (type == 1) {
- map = deptService.getSysDeptHyAndYxYjWjCustomerList13("A30", name, tjNumber, 1, page, pageSize);
- }
+ if (type == 1) map = deptService.getSysDeptHyAndYxYjWjCustomerList13(name, tjNumber, 1, page, pageSize);
return AjaxResult.success(map);
}
@@ -243,10 +235,10 @@
Map<String, Object> map = null;
if (type == 0) {
- map = deptService.getSysDeptHyAndYxYjWjCustomerList13("A32", name, tjNumber, 0, page, pageSize);
+ map = deptService.getSysDeptHyAndYxYjWjCustomerList13( name, tjNumber, 0, page, pageSize);
}
if (type == 1) {
- map = deptService.getSysDeptHyAndYxYjWjCustomerList13("A32", name, tjNumber, 1, page, pageSize);
+ map = deptService.getSysDeptHyAndYxYjWjCustomerList13( name, tjNumber, 1, page, pageSize);
}
return AjaxResult.success(map);
}
@@ -264,8 +256,6 @@
List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList(patname, sex, null);
return AjaxResult.success(tjYxjcList);
}
-
-
/**
@@ -528,7 +518,7 @@
// }
logger.info("鎺ュ彛 DataSourceContextHolder ->{}", DataSourceContextHolder.getDataSourceKey());
logger.info("鎺ュ彛 DynamicDataSourceContextHolder ->{}", DynamicDataSourceContextHolder.getDataSourceType());
- asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order,orderRemark);
+ asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order, orderRemark);
LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
qww.eq(TjOrderDetail::getProId, orderRemark.getProId());
@@ -578,6 +568,7 @@
// 淇敼鎸夌収绉戝鏌ヨ
public AjaxResult getParentList(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
String userId = SecurityUtils.getLoginUser().getUserId();
+ log.info("褰撳墠鐧诲綍鐢ㄦ埛ID ->{}",userId);
Integer ksId = null;
SysUser sysUser = null;
if (null != userId) {
@@ -587,6 +578,7 @@
}
ksId = Math.toIntExact(sysUser.getDeptId());
}
+ SysDept dept = deptService.getById(ksId);
String configByKey = configService.selectConfigByKey("sfkqdyhis");
// 鍒ゆ柇鏄惁鏀惰垂 璇锋眰鎺ュ彛
TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
@@ -653,241 +645,275 @@
}
}
}
- List<TjOrderRemark> list;
- if(null != sysUser && sysUser.getUserName().equals("10001")){
- list=remarkService.yiShengJianChaGetPrentProCJGLY(tjNumber);
- }else {
- list= remarkService.yiShengJianChaGetPrentPro(tjNumber, split);
- }
- if (null ==list || list.isEmpty()) {
- return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
- }
- for (TjOrderRemark tjOrderRemark : list) {
- TjProject tjProject = projectService.getById(tjOrderRemark.getProId());
- if (null != tjProject) {
- tjOrderRemark.setProName(tjProject.getProName());
+ if(null !=dept){
+ if(StringUtil.isNotBlank(dept.getSjks())){
+ String[] arr = dept.getSjks().split(","); // 鏍规嵁閫楀彿杩涜鍒囧壊
+ for (String s : arr) {
+ int num = Integer.parseInt(s); // 灏嗘瘡涓瓙瀛楃涓茶浆鎹负integer绫诲瀷
+ split.add(num); // 娣诲姞鍒板垪琛ㄤ腑
}
}
- return AjaxResult.success(list);
-}
-
-@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);
- remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString());
-}
-
-/**
- * 鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏
- *
- * @return
- */
-@GetMapping("/getOrderDetailByProParentId")
-@ApiOperation("鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏")
-public AjaxResult getOrderDetailByProParentId(@ApiParam(value = "鐖堕」鐩甶d") @RequestParam String proParentId,
- @ApiParam(value = "浣撴鍙�") @RequestParam String tjNumber) {
- if (null == SecurityUtils.getLoginUser().getUserId() || null == userService.getById(SecurityUtils.getLoginUser().getUserId())) {
- return AjaxResult.error("鑾峰彇鐢ㄦ埛淇℃伅閿欒");
+ }
+ log.info("鏌ヨ鍏宠仈绉戝闆嗗悎 ->{}",split);
+ List<TjOrderRemark> list;
+ if (null != sysUser && sysUser.getUserName().equals("10001")) {
+ list = remarkService.yiShengJianChaGetPrentProCJGLY(tjNumber);
+ } else {
+ list = remarkService.yiShengJianChaGetPrentPro(tjNumber, split);
+ }
+ if (null == list || list.isEmpty()) {
+ log.info("瑙﹀彂璇ョ瀹や笅鏃犻」鐩�");
+ return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
+ }
+ for (TjOrderRemark tjOrderRemark : list) {
+ TjProject tjProject = projectService.getById(tjOrderRemark.getProId());
+ if (null != tjProject) {
+ tjOrderRemark.setProName(tjProject.getProName());
+ }
+ }
+ return AjaxResult.success(list);
}
- TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);
- List<TjProject> proParentList = projectService.getTjProjectListByTbTransition(proParentId, tjNumber);
+ @GetMapping("/getParentListWs")
+ @ApiOperation(value = "鍖荤敓鐣岄潰澶栭�佽彍鍗�(鍙樉绀虹埗椤圭洰鍒楄〃)")
+// 淇敼鎸夌収绉戝鏌ヨ
+ public AjaxResult getParentListWs(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
+ TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
+ if (null == tjOrder) {
+ return AjaxResult.error("鏈壘鍒颁綋妫�璁板綍");
+ }
+ List<TjOrderRemark> list = remarkService.yiShengJianChaGetPrentProWs(tjNumber);
+ if (null == list || list.isEmpty()) {
+ return AjaxResult.error("鏆傛棤澶栭�侀」鐩紒");
+ }
+ for (TjOrderRemark tjOrderRemark : list) {
+ TjProject tjProject = projectService.getById(tjOrderRemark.getProId());
+ if (null != tjProject) {
+ tjOrderRemark.setProName(tjProject.getProName());
+ }
+ }
+ return AjaxResult.success(list);
+ }
- if (null == proParentList || proParentList.isEmpty()) {
+ @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);
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
+ }
+
+ /**
+ * 鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏
+ *
+ * @return
+ */
+ @GetMapping("/getOrderDetailByProParentId")
+ @ApiOperation("鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏")
+ public AjaxResult getOrderDetailByProParentId(@ApiParam(value = "鐖堕」鐩甶d") @RequestParam String proParentId,
+ @ApiParam(value = "浣撴鍙�") @RequestParam String tjNumber) {
+ if (null == SecurityUtils.getLoginUser().getUserId() || null == userService.getById(SecurityUtils.getLoginUser().getUserId())) {
+ return AjaxResult.error("鑾峰彇鐢ㄦ埛淇℃伅閿欒");
+ }
+
+ TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);
+
+ List<TjProject> proParentList = projectService.getTjProjectListByTbTransition(proParentId, tjNumber);
+
+ if (null == proParentList || proParentList.isEmpty()) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("xiaoJieIds", null);
+ map.put("sons", projectService.list(new LambdaQueryWrapper<TjProject>().eq(TjProject::getProId, proParentId).orderByAsc(TjProject::getXh)));
+ map.put("xiaoJie", null);
+ map.put("remark", remark.getRemark());
+ return AjaxResult.success(map);
+ }
+ List<Long> proParentIdList = proParentList.stream().map(TjProject::getProId).collect(Collectors.toList());
+ TjOrder one = orderService.getOrderByTjNum(tjNumber);
+ if (null == one) {
+ return AjaxResult.success("璇ョ敤鎴锋殏鏃舵病鏈変綋妫�鏁版嵁");
+ }
+ List<TjOrderDetail> tjOrderDetails = detailService.getTjOrderDetailListInProParentIdList(String.valueOf(one.getOrderId()), proParentIdList);
+ List<TjOrderDetail> tjOrderDetailList = new ArrayList<>();
+ if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
+ for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
+ TjProject project = projectService.getById(tjOrderDetail.getProId());
+ if (null != project) {
+ //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
+ if ("N".equals(project.getNeedReport())) {
+ continue;
+ }
+ List<TjRules> rulesList = tjRulesService.getTjRulesListByTjNumAndProId(tjNumber, tjOrderDetail.getProId());
+ tjOrderDetail.setRulesList(rulesList);
+ tjOrderDetail.setProject(project);
+ tjOrderDetail.setResultType(project.getResultType());
+ if (null != remark.getDoctorName()) {
+ SysUser byId = userService.getById(remark.getDoctorName());
+ if (byId != null) {
+ tjOrderDetail.setDoctorName(userService.getById(remark.getDoctorName()).getNickName());
+ }
+ } else {
+ tjOrderDetail.setDoctorName(null);
+ }
+ if (StringUtil.isBlank(tjOrderDetail.getProResult())) {
+ tjOrderDetail.setProResult(project.getProDefault());
+ }
+ tjOrderDetail.setXh(project.getXh());
+ tjOrderDetailList.add(tjOrderDetail);
+ }
+ }
+ }
Map<String, Object> map = new HashMap<>();
- map.put("xiaoJieIds", null);
- map.put("sons", projectService.list(new LambdaQueryWrapper<TjProject>().eq(TjProject::getProId, proParentId)));
- map.put("xiaoJie", null);
+ List<TjAdvice> adviceList = new ArrayList<>();
+ if (null != remark) {
+ String[] strings = StringUtils.split(remark.getSummary(), ";");
+ if (null != strings && strings.length > 0) {
+ List<TjAdvice> list = tjAdviceService.getAdviceStringByIds(strings);
+ adviceList.addAll(list);
+ }
+ map.put("xiaoJieIds", StringUtils.split(remark.getSummary(), ";"));
+ } else {
+ map.put("xiaoJieIds", null);
+ }
+ map.put("sons", tjOrderDetailList.stream().sorted(Comparator.comparing(TjOrderDetail::getXh)).collect(Collectors.toList()));
+ map.put("xiaoJie", adviceList);
map.put("remark", remark.getRemark());
return AjaxResult.success(map);
}
- List<Long> proParentIdList = proParentList.stream().map(TjProject::getProId).collect(Collectors.toList());
- TjOrder one = orderService.getOrderByTjNum(tjNumber);
- if (null == one) {
- return AjaxResult.success("璇ョ敤鎴锋殏鏃舵病鏈変綋妫�鏁版嵁");
- }
- List<TjOrderDetail> tjOrderDetails = detailService.getTjOrderDetailListInProParentIdList(String.valueOf(one.getOrderId()), proParentIdList);
- List<TjOrderDetail> tjOrderDetailList = new ArrayList<>();
- if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
- for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
- TjProject project = projectService.getById(tjOrderDetail.getProId());
- if(null != project){
- //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
- if ("N".equals(project.getNeedReport())) {
- continue;
- }
- List<TjRules> rulesList = tjRulesService.getTjRulesListByTjNumAndProId(tjNumber, tjOrderDetail.getProId());
- tjOrderDetail.setRulesList(rulesList);
- tjOrderDetail.setProject(project);
- tjOrderDetail.setResultType(project.getResultType());
- if (null != remark.getDoctorName()) {
- SysUser byId = userService.getById(remark.getDoctorName());
- if (byId != null) {
- tjOrderDetail.setDoctorName(userService.getById(remark.getDoctorName()).getNickName());
- }
- } else {
- tjOrderDetail.setDoctorName(null);
- }
- if(StringUtil.isBlank(tjOrderDetail.getProResult())){
- tjOrderDetail.setProResult(project.getProDefault());
- }
- tjOrderDetailList.add(tjOrderDetail);
+
+ /**
+ * 鐘舵�佷慨鏀�
+ */
+ @PutMapping("/changeStatus")
+ @ApiOperation("閮ㄩ棬鐘舵�佷慨鏀�")
+ public AjaxResult changeStatus(@RequestBody SysDept dept) {
+ //鍒ゆ柇鏄惎鐢ㄨ繕鏄�
+ if ("1".equals(dept.getStatus())) {
+ //鍒ゆ柇鐢ㄦ埛琛ㄤ腑鏈夋病鏈変汉鍦ㄨ绉戝涓�
+ LambdaQueryWrapper<SysUser> wq = new LambdaQueryWrapper<>();
+ wq.eq(SysUser::getDeptId, dept.getDeptId());
+ List<SysUser> list = userService.list(wq);
+ if (!list.isEmpty()) {
+ return AjaxResult.error("璇ョ瀹や笅鏈夊伐浣滀汉鍛橈紝涓嶈兘鍋滅敤锛�");
}
}
- }
- Map<String, Object> map = new HashMap<>();
- List<TjAdvice> adviceList = new ArrayList<>();
- if (null != remark) {
- String[] strings = StringUtils.split(remark.getSummary(), ";");
- if (null != strings && strings.length > 0) {
- List<TjAdvice> list = tjAdviceService.getAdviceStringByIds(strings);
- adviceList.addAll(list);
+ dept.setUpdateBy(getUsername());
+ int i = deptService.updateDeptStatus(dept);
+ if (i == 0) {
+ return AjaxResult.error("淇敼澶辫触");
}
- map.put("xiaoJieIds", StringUtils.split(remark.getSummary(), ";"));
- } else {
- map.put("xiaoJieIds", null);
- }
- map.put("sons", tjOrderDetailList);
- map.put("xiaoJie", adviceList);
- map.put("remark", remark.getRemark());
- return AjaxResult.success(map);
-}
+ return AjaxResult.success("淇敼鎴愬姛");
-/**
- * 鐘舵�佷慨鏀�
- */
-@PutMapping("/changeStatus")
-@ApiOperation("閮ㄩ棬鐘舵�佷慨鏀�")
-public AjaxResult changeStatus(@RequestBody SysDept dept) {
- //鍒ゆ柇鏄惎鐢ㄨ繕鏄�
- if ("1".equals(dept.getStatus())) {
- //鍒ゆ柇鐢ㄦ埛琛ㄤ腑鏈夋病鏈変汉鍦ㄨ绉戝涓�
- LambdaQueryWrapper<SysUser> wq = new LambdaQueryWrapper<>();
- wq.eq(SysUser::getDeptId, dept.getDeptId());
- List<SysUser> list = userService.list(wq);
- if (!list.isEmpty()) {
- return AjaxResult.error("璇ョ瀹や笅鏈夊伐浣滀汉鍛橈紝涓嶈兘鍋滅敤锛�");
+ }
+
+
+ /**
+ * 鏍规嵁椤圭洰id鑾峰彇寤鸿
+ */
+ @GetMapping("/getDeptAdvice")
+ @ApiOperation(value = "鏍规嵁椤圭洰id鑾峰彇寤鸿")
+ 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<>();
+ if (null != proId) {
+ wq1.eq(TjAdvice::getProId, proId);
}
- }
- dept.setUpdateBy(getUsername());
- int i = deptService.updateDeptStatus(dept);
- if (i == 0) {
- return AjaxResult.error("淇敼澶辫触");
- }
- return AjaxResult.success("淇敼鎴愬姛");
-
-}
-
-
-/**
- * 鏍规嵁椤圭洰id鑾峰彇寤鸿
- */
-@GetMapping("/getDeptAdvice")
-@ApiOperation(value = "鏍规嵁椤圭洰id鑾峰彇寤鸿")
-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<>();
- if (null != proId) {
- wq1.eq(TjAdvice::getProId, proId);
- }
- if (null != nr && !nr.isEmpty()) {
- wq1.like(TjAdvice::getTitle, nr);
- } else if (null != pym && !pym.isEmpty()) {
- wq1.like(TjAdvice::getTitle, pym);
- }
+ 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());
+ 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);
-}
+ 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);
+ @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);
}
- return AjaxResult.success(list);
-}
-/**
- * 鑾峰彇閮ㄩ棬鏍戝垪琛�
- */
+ /**
+ * 鑾峰彇閮ㄩ棬鏍戝垪琛�
+ */
//@PreAuthorize("@ss.hasPermi('system:dept:list')")
-@GetMapping("/deptTree")
-@ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�")
-public AjaxResult deptTree(SysDept dept) {
- return success(deptService.selectDeptTreeList(dept));
-}
-
-
-@GetMapping("/deptTree111")
-@ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�1111111111")
-public AjaxResult deptTree111(SysDept dept) {
- final List<TreeSelect> treeSelects = deptService.selectDeptTreeList1(dept);
- return success(treeSelects);
-}
-
-
-/**
- * 鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�
- */
-@GetMapping("/getChildList")
-@ApiOperation(value = "鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�")
-public AjaxResult getChildList(String deptName) {
- LambdaQueryWrapper<SysDept> wq = new LambdaQueryWrapper<>();
- wq.ne(SysDept::getParentId, 0);
- if (deptName != null) {
- wq.like(SysDept::getDeptName, deptName);
+ @GetMapping("/deptTree")
+ @ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�")
+ public AjaxResult deptTree(SysDept dept) {
+ return success(deptService.selectDeptTreeList(dept));
}
- List<SysDept> depts = deptService.list(wq);
- return success(depts);
-}
+
+
+ @GetMapping("/deptTree111")
+ @ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�1111111111")
+ public AjaxResult deptTree111(SysDept dept) {
+ final List<TreeSelect> treeSelects = deptService.selectDeptTreeList1(dept);
+ return success(treeSelects);
+ }
+
+
+ /**
+ * 鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�
+ */
+ @GetMapping("/getChildList")
+ @ApiOperation(value = "鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�")
+ public AjaxResult getChildList(String deptName) {
+ LambdaQueryWrapper<SysDept> wq = new LambdaQueryWrapper<>();
+ wq.ne(SysDept::getParentId, 0);
+ if (deptName != null) {
+ wq.like(SysDept::getDeptName, deptName);
+ }
+ List<SysDept> depts = deptService.list(wq);
+ return success(depts);
+ }
@GetMapping("/getxmjgz")
@ApiOperation(value = "鍖荤敓妫�鏌ュ鑾峰彇椤圭洰瑙勫垯鍊�")
- public AjaxResult getxmjgz(@RequestParam String proId,@RequestParam(required = false) String xmgz) {
+ public AjaxResult getxmjgz(@RequestParam String proId, @RequestParam(required = false) String xmgz) {
LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>();
wq.eq(TjRules::getProId, proId);
- if(StringUtil.isNotBlank(xmgz))wq.like(TjRules::getRuleStr,xmgz);
+ if (StringUtil.isNotBlank(xmgz)) wq.like(TjRules::getRuleStr, xmgz);
List<TjRules> list = tjRulesService.list(wq);
- if(null !=list && !list.isEmpty()){
+ if (null != list && !list.isEmpty()) {
for (TjRules tjRules : list) {
- if(null !=tjRules){
- tjRules.setJm(PinyinUtil.getFirstLetter(tjRules.getRuleStr(),""));
+ if (null != tjRules) {
+ tjRules.setJm(PinyinUtil.getFirstLetter(tjRules.getRuleStr(), ""));
}
}
}
@@ -895,9 +921,9 @@
}
- @GetMapping ("/ysjcbGetProByTjNumAndOrderId")
- @ApiOperation (value = "鍖荤敓妫�鏌ラ〉闈㈡煡璇㈡楠屾鏌ラ」鐩帴鍙�")
- public AjaxResult ysjcbGetProByTjNumAndOrderId(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
+ @GetMapping("/ysjcbGetProByTjNumAndOrderId")
+ @ApiOperation(value = "鍖荤敓妫�鏌ラ〉闈㈡煡璇㈡楠屾鏌ラ」鐩帴鍙�")
+ public AjaxResult ysjcbGetProByTjNumAndOrderId(@ApiParam(value = "浣撴鍙�") @RequestParam String tjNumber) {
// List<TjOrderRemark> orderRemarkList = orderRemarkService.getTjOrderRemarkListByTjNum(tjNumber);
// List<CsProVo> list = new ArrayList<>();
// if (null != orderRemarkList && orderRemarkList.size() > 0) {
--
Gitblit v1.8.0