root/yongYuJiaJu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/yongYuJiaJu

Browse Source
This commit is contained in:
ldj_willow
2022-10-19 20:17:08 +08:00
parent d374da8786 64df717338
commit bd807d0486
4 changed files with 102 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/TaskDto.java
View File

@@ -24,7 +24,7 @@ public class TaskDto implements Serializable {
private String task_code;
/** 任务类型 */
private Long task_type;
private String task_type;
/** 任务状态 */
private String task_status;

7
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
View File

@@ -14,6 +14,8 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.basedata.service.ClassstandardService;
import org.nl.wms.basedata.service.dto.ClassstandardDto;
import org.nl.wms.sch.service.TaskService;
import org.nl.wms.sch.service.dto.TaskDto;
import org.springframework.data.domain.Pageable;
@@ -35,6 +37,8 @@ import java.util.Map;
@Slf4j
public class TaskServiceImpl implements TaskService {
private final ClassstandardService classstandardService;
@Override
public Map<String, Object> queryAll(Map form, Pageable page) {
@@ -66,7 +70,8 @@ public class TaskServiceImpl implements TaskService {
map.put("vehicle_code", "%" + whereJson.getString("vehicle_code") + "%");
}
if (StrUtil.isNotEmpty(whereJson.getString("task_type"))) {
map.put("task_type", whereJson.getString("task_type"));
ClassstandardDto task_type = classstandardService.findById(whereJson.getString("task_type"));
map.put("task_type", task_type.getClass_code());
}
if (StrUtil.isNotEmpty(whereJson.getString("taskdtl_type"))) {
map.put("taskdtl_type", whereJson.getString("taskdtl_type"));

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql
View File

@@ -52,10 +52,12 @@
PAGEQUERY
SELECT
task.*,
md.class_name task_type_name
md.class_name task_type_name,
dict.label task_status_name
FROM
sch_base_task task
LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
LEFT JOIN sys_dict_detail dict ON dict.`value` = task.task_status AND dict.`name` = 'task_status'
WHERE
task.is_delete = '0'
OPTION 输入.task_type <> ""