From 922e8c6763f9c8cd0311267b531b8b684ac5ea59 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期六, 08 十月 2022 17:41:26 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 2 +-
ycl-platform/src/main/java/com/ycl/entity/dict/DataDictionary.java | 3 +--
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java | 17 +++++++++++++++--
ycl-platform/src/main/java/com/ycl/service/caseHandler/IDisposeRecordService.java | 2 +-
ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java | 4 ++--
ycl-platform/src/main/resources/mapper/dict/DataDictionaryMapper.xml | 11 ++++++-----
6 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
index 13fba33..8f29023 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
@@ -238,7 +238,7 @@
@ApiOperation(value = "鏆備笉澶勭疆閲嶆柊澶勭疆")
@PutMapping("/reset")
public CommonResult resetCase(@RequestParam Integer caseId) {
- Integer firstNum = 0;
+ Integer firstNum = 1;
Integer state = iDisposeRecordService
.list(new LambdaQueryWrapper<DisposeRecord>()
.eq(DisposeRecord::getBaseCaseId, caseId).
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java
index 624d095..a7afe47 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java
@@ -39,9 +39,9 @@
**/
@ApiOperation(value = "鏌ヨ", response = MyBacklogVO.class)
@GetMapping("/query")
- public CommonResult searchMyTask(@RequestParam Integer caseId) {
+ public CommonResult searchMyTask(@RequestParam(required = false) String num) {
AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
- return CommonResult.success(iDisposeRecordService.listMyTask(caseId, user.getUserId()));
+ return CommonResult.success(iDisposeRecordService.listMyTask(num, user.getUserId()));
}
}
diff --git a/ycl-platform/src/main/java/com/ycl/entity/dict/DataDictionary.java b/ycl-platform/src/main/java/com/ycl/entity/dict/DataDictionary.java
index 66605c2..5cbe0eb 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/dict/DataDictionary.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/dict/DataDictionary.java
@@ -49,7 +49,6 @@
*/
@TableField("code")
@ApiModelProperty(value = "缂栫爜 ps:鏆傛椂涓嶄紶",dataType = "String")
- @NotBlank(message = "缂栫爜涓虹┖")
private String code;
/**
@@ -57,7 +56,7 @@
*/
@TableField("parent_id")
@ApiModelProperty(value = "鐖剁骇id ps:涓轰笂涓�绾х殑id",dataType = "String")
- private String parentId;
+ private Integer parentId;
/**
* 灞傜骇
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IDisposeRecordService.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IDisposeRecordService.java
index 362dbd1..e7fb978 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IDisposeRecordService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IDisposeRecordService.java
@@ -16,5 +16,5 @@
*/
public interface IDisposeRecordService extends IService<DisposeRecord> {
- List<MyBacklogVO> listMyTask(Integer caseId, Long userId);
+ List<MyBacklogVO> listMyTask(String num, Long userId);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
index 1777567..2dbd9e2 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
@@ -1,6 +1,7 @@
package com.ycl.service.caseHandler.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.entity.caseHandler.DisposeRecord;
@@ -33,16 +34,28 @@
DisposeRecordMapper disposeRecordMapper;
@Override
- public List<MyBacklogVO> listMyTask(Integer caseId, Long userId) {
+ public List<MyBacklogVO> listMyTask(String num, Long userId) {
return disposeRecordMapper.selectList(
new LambdaQueryWrapper<DisposeRecord>()
.eq(DisposeRecord::getHandlerId, userId.intValue())
.isNull(DisposeRecord::getEndTime))
.stream()
+ .filter(item -> {
+ if (StringUtils.isBlank(num)){
+ return true;
+ }else {
+ BaseCase baseCase = baseCaseMapper.selectById(item.getBaseCaseId());
+ if (baseCase.getCode().contains(num)) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+ })
.map(item -> {
MyBacklogVO myBacklogVO = new MyBacklogVO();
BeanUtils.copyProperties(item, myBacklogVO);
- BaseCase baseCase = baseCaseMapper.selectById(caseId);
+ BaseCase baseCase = baseCaseMapper.selectById(item.getBaseCaseId());
myBacklogVO.setCategory(baseCase.getCategory());
myBacklogVO.setEventSource(baseCase.getEventSource());
myBacklogVO.setCode(baseCase.getCode());
diff --git a/ycl-platform/src/main/resources/mapper/dict/DataDictionaryMapper.xml b/ycl-platform/src/main/resources/mapper/dict/DataDictionaryMapper.xml
index ba16227..7ff04d6 100644
--- a/ycl-platform/src/main/resources/mapper/dict/DataDictionaryMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/dict/DataDictionaryMapper.xml
@@ -40,7 +40,8 @@
d1.`level` = '2'
AND d1.type_code = '06'
<if test="keyWord !=null and keyWord !=''">
- AND d1.`name` LIKE '%${keyWord}%'
+ AND (d1.`name` LIKE '%${keyWord}%'
+ or d2.`name` LIKE '%${keyWord}%')
</if>
</where>
@@ -54,11 +55,11 @@
d3.`name` AS typeSecond,
d4.`name` AS typeThird
FROM `ums_data_dictionary` AS d1
- LEFT JOIN ums_data_dictionary AS d2 ON d1.id = d2.parent_id
- LEFT JOIN ums_data_dictionary AS d3 ON d2.id = d3.parent_id
- LEFT JOIN ums_data_dictionary AS d4 ON d3.id = d4.parent_id
+ LEFT JOIN ums_data_dictionary AS d2 ON d1.parent_id = d2.id
+ LEFT JOIN ums_data_dictionary AS d3 ON d2.parent_id = d3.id
+ LEFT JOIN ums_data_dictionary AS d4 ON d3.parent_id = d4.id
<where>
- d1.parent_id = 0
+ d1.`level` = '4'
AND d1.type_code = '01'
<if test="keyWord !=null and keyWord !=''">
AND (d1.`name` LIKE '%${keyWord}%'
--
Gitblit v1.8.0