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

rev:任务管理查询按照人员区域权限查询

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-07-18 17:06:10 +08:00
parent 342c1502f7
commit 373dd5a411
3 changed files with 59 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@ import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.modules.wql.util.WqlUtil; import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.basedata.master.service.ClassstandardService; import org.nl.wms.basedata.master.service.ClassstandardService;
import org.nl.wms.basedata.master.service.dto.ClassstandardDto; import org.nl.wms.basedata.master.service.dto.ClassstandardDto;
import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl;
import org.nl.wms.sch.service.PointService; import org.nl.wms.sch.service.PointService;
import org.nl.wms.sch.service.RegionService; import org.nl.wms.sch.service.RegionService;
import org.nl.wms.sch.service.TaskService; import org.nl.wms.sch.service.TaskService;
@@ -89,6 +90,12 @@ public class TaskServiceImpl implements TaskService {
if (StrUtil.isNotEmpty(whereJson.getString("end_time"))) { if (StrUtil.isNotEmpty(whereJson.getString("end_time"))) {
map.put("end_time", whereJson.getString("end_time")); map.put("end_time", whereJson.getString("end_time"));
} }
//获取人员对应的区域
UserAreaServiceImpl userAreaService = new UserAreaServiceImpl();
String in_area_id = userAreaService.getInArea();
if (ObjectUtil.isNotEmpty(in_area_id)) {
map.put("in_area_id", in_area_id);
}
JSONObject json = WQL.getWO("QSCH_TASK_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "task.update_time desc"); JSONObject json = WQL.getWO("QSCH_TASK_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "task.update_time desc");
JSONArray content = json.getJSONArray("content"); JSONArray content = json.getJSONArray("content");
JSONArray res = new JSONArray(); JSONArray res = new JSONArray();

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

@@ -17,6 +17,7 @@
输入.task_status TYPEAS s_string 输入.task_status TYPEAS s_string
输入.finished_type TYPEAS s_string 输入.finished_type TYPEAS s_string
输入.task_type TYPEAS f_string 输入.task_type TYPEAS f_string
输入.in_area_id TYPEAS f_string
输入.point_code1 TYPEAS s_string 输入.point_code1 TYPEAS s_string
输入.point_code2 TYPEAS s_string 输入.point_code2 TYPEAS s_string
输入.task_code TYPEAS s_string 输入.task_code TYPEAS s_string
@@ -49,49 +50,56 @@
IF 输入.flag = "1" IF 输入.flag = "1"
PAGEQUERY PAGEQUERY
SELECT SELECT * FROM (
task.*, SELECT
md.class_name task_type_name, task.*,
dict.label task_status_name md.class_name task_type_name,
FROM dict.label task_status_name,
sch_base_task task case when task.task_type like '0105%' then 'LK' ELSE task.product_area end AS final_product_area
LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code FROM
LEFT JOIN sys_dict dict ON dict.`value` = task.task_status AND dict.`code` = 'task_status' sch_base_task task
WHERE LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
task.is_delete = '0' LEFT JOIN sys_dict dict ON dict.`value` = task.task_status AND dict.`code` = 'task_status'
OPTION 输入.task_type <> "" WHERE
md.class_id in 输入.task_type task.is_delete = '0'
ENDOPTION OPTION 输入.task_type <> ""
OPTION 输入.finished_type <> "" md.class_id in 输入.task_type
task.finished_type = 输入.finished_type ENDOPTION
ENDOPTION OPTION 输入.finished_type <> ""
OPTION 输入.begin_time <> "" task.finished_type = 输入.finished_type
task.create_time >= 输入.begin_time ENDOPTION
ENDOPTION OPTION 输入.begin_time <> ""
OPTION 输入.end_time <> "" task.create_time >= 输入.begin_time
task.create_time <= 输入.end_time ENDOPTION
ENDOPTION OPTION 输入.end_time <> ""
OPTION 输入.unFinish <> "" task.create_time <= 输入.end_time
task.task_status <> '07' ENDOPTION
ENDOPTION OPTION 输入.unFinish <> ""
OPTION 输入.task_status <> "" task.task_status <> '07'
find_in_set( task.task_status, 输入.task_status) ENDOPTION
ENDOPTION OPTION 输入.task_status <> ""
OPTION 输入.vehicle_code <> "" find_in_set( task.task_status, 输入.task_status)
(task.vehicle_code like 输入.vehicle_code) ENDOPTION
ENDOPTION OPTION 输入.vehicle_code <> ""
OPTION 输入.task_code <> "" (task.vehicle_code like 输入.vehicle_code)
(task.task_code like 输入.task_code) ENDOPTION
ENDOPTION OPTION 输入.task_code <> ""
OPTION 输入.point_code1 <> "" (task.task_code like 输入.task_code)
(task.point_code1 like 输入.point_code1) ENDOPTION
ENDOPTION OPTION 输入.point_code1 <> ""
OPTION 输入.begin_time <> "" (task.point_code1 like 输入.point_code1)
task.create_time >= 输入.begin_time ENDOPTION
ENDOPTION OPTION 输入.begin_time <> ""
OPTION 输入.end_time <> "" task.create_time >= 输入.begin_time
task.create_time <= 输入.end_time ENDOPTION
ENDOPTION OPTION 输入.end_time <> ""
task.create_time <= 输入.end_time
ENDOPTION
) a
WHERE 1=1
OPTION 输入.in_area_id <> ""
a.final_product_area IN 输入.in_area_id
ENDOPTION
ENDSELECT ENDSELECT
ENDPAGEQUERY ENDPAGEQUERY
ENDIF ENDIF

2
lms/nladmin-ui/src/views/wms/basedata/product/userArea/index.vue
View File

@@ -115,7 +115,7 @@ export default {
level: 3, level: 3,
currentId: 0, menuLoading: false, showButton: false, currentId: 0, menuLoading: false, showButton: false,
menus: [], menuIds: [], depts: [], deptDatas: [], // 多选时使用 menus: [], menuIds: [], depts: [], deptDatas: [], // 多选时使用
tableData: [{ 'product_area': 'A1' }, { 'product_area': 'A2' }, { 'product_area': 'A3' }, { 'product_area': 'A4' }], tableData: [{ 'product_area': 'A1' }, { 'product_area': 'A2' }, { 'product_area': 'A3' }, { 'product_area': 'A4' }, { 'product_area': 'LK' }],
currentRow: null, currentRow: null,
permission: { permission: {
add: ['admin', 'roles:add'], add: ['admin', 'roles:add'],