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

更新

Browse Source
This commit is contained in:
gengby
2023-03-02 10:11:33 +08:00
parent 93c5555cc0
commit e40c6c9b0f
6 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -189,9 +189,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
JSONObject ins = new JSONObject();
ins.put("task_id", jo.get("instruction_id"));
ins.put("task_code", jo.get("instruction_code"));
ins.put("task_type", jo.get("instruction_type"));
ins.put("task_status", jo.get("instruction_status"));
ins.put("start_point_code", jo.get("start_point_code"));
ins.put("start_point_code2", jo.get("start_point_code2"));
ins.put("next_point_code", jo.get("next_point_code"));
ins.put("next_point_code2", jo.get("next_point_code2"));
ins.put("matarial", jo.get("matarial"));
ins.put("remark", jo.get("remark"));
ins.put("create_by", jo.get("create_by"));

4
acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/wql/QINST_QUERY.wql
View File

@@ -81,6 +81,10 @@
inst.start_point_code LIKE CONCAT ( '%', 输入.point_code, '%' )
OR
inst.next_point_code LIKE CONCAT ( '%', 输入.point_code, '%' )
OR
inst.start_point_code2 LIKE CONCAT ( '%', 输入.point_code, '%' )
OR
inst.next_point_code2 LIKE CONCAT ( '%', 输入.point_code, '%' )
)
ENDOPTION
OPTION 输入.instruction_type <> ""

4
acs/nladmin-system/src/main/java/org/nl/acs/task/service/wql/QTASK_QUERY.wql
View File

@@ -105,6 +105,10 @@ IF 输入.flag = "2"
task.start_point_code LIKE CONCAT ( '%', 输入.point_code, '%' )
OR
task.next_point_code LIKE CONCAT ( '%', 输入.point_code, '%')
OR
task.start_point_code2 LIKE CONCAT ( '%', 输入.point_code, '%' )
OR
task.next_point_code2 LIKE CONCAT ( '%', 输入.point_code, '%')
)
ENDOPTION
OPTION 输入.create_time <> ""