bonus
/
GZMachinesWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

机具库存收藏修改

This commit is contained in:
jiang 2025-07-09 19:01:52 +08:00
parent 6d0deb9dbc
commit de6e56f059
2 changed files with 266 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
WebContent/WEB-INF/views/rm/UnFinishContentList.jsp
View File

@ -192,7 +192,7 @@
</th> --%>
<th style="vertical-align:middle;color:red" onclick="topage()" class="center">${ma.number}</th>
<th style="vertical-align:middle;color:red" onclick="topage(${ma.id} , '${ma.processName}')" class="center">${ma.number}</th>
<th style="vertical-align:middle;" class="center">${ma.creatorName}</th>
<th style="vertical-align:middle;color:red" class="center">
<c:choose>
@ -217,7 +217,7 @@
<script type="text/javascript">
var uname = localStorage.getItem("uname");
var pwd = localStorage.getItem("pwd");
function topage() {
function topage(id,processName) {
$.ajax({
type: "post",
url: "http://127.0.0.1:21522/gz-car/login/userLogin",
@ -231,8 +231,13 @@
localStorage.setItem("token", data.token);
localStorage.setItem("name", name);
//window.open("http://192.168.0.14:21625/gz-gqj/index.html")
window.open("http://localhost:63343/gz_car_ui/index.html#/page/car_demand_plan/dispatch_car_list.html")
if(processName === '派车计划'){
window.open("http://localhost:63343/gz_car_ui/page/car_demand_plan/child/dispatch_car_detail.html?id="+id +"&token="+data.token)
}else if(processName === '用车计划'){
window.open("http://localhost:63343/gz_car_ui/page/car_demand_plan/child/apply_plan_detail.html?id="+id +"&token="+data.token)
}
} else {
alert("没有权限！");

66
resources/mybatis/wf/TaskRecordMapper.xml
View File

@ -52,8 +52,8 @@
</select>
<select id="findUnFinishContent" parameterType="com.bonus.wf.beans.TaskRecordBean" resultMap="taskRecord">
(
SELECT
(
SELECT
wtr.id AS id,
CASE
WHEN wtr.DEFINITION_ID IN (1,2,8) THEN wtr.NUMBER
@ -69,13 +69,13 @@ SELECT
ELSE wtr.IS_FINISH
END AS isFinish,
'TASK' AS source
FROM
FROM
wf_task_record wtr
LEFT JOIN wf_task_record wtr1 ON wtr1.ID = wtr.SUP_ID
LEFT JOIN pm_user pu ON pu.id = wtr.OPERATION_USER
LEFT JOIN wf_task_definition wtd ON wtd.ID = wtr.DEFINITION_ID
LEFT JOIN wf_process_definition wpd ON wpd.id = wtr.PROCESS_ID
WHERE
LEFT JOIN wf_task_record wtr1 ON wtr1.ID = wtr.SUP_ID
LEFT JOIN pm_user pu ON pu.id = wtr.OPERATION_USER
LEFT JOIN wf_task_definition wtd ON wtd.ID = wtr.DEFINITION_ID
LEFT JOIN wf_process_definition wpd ON wpd.id = wtr.PROCESS_ID
WHERE
wtr.DEFINITION_ID IN (1, 2, 5, 8, 11)
AND (
(wtr.DEFINITION_ID = 11 AND wtr1.IS_FINISH = #{param.isFinish})
@ -92,12 +92,12 @@ WHERE
OR pu.NAME LIKE CONCAT('%', #{param.keyWord}, '%')
)
</if>
)
)
UNION ALL
UNION ALL
(
SELECT
(
SELECT
cpa.id AS id,
cpa.code AS number,
'用车计划' AS processName,
@ -107,38 +107,34 @@ SELECT
NULL AS definitionId,
NULL AS isFinish,
'PLAN' AS source
FROM
FROM
car_plan_apply cpa
LEFT JOIN pm_user pu ON pu.id = cpa.creator
WHERE
LEFT JOIN pm_user pu ON pu.id = cpa.creator
WHERE
cpa.status = '1'
AND (
<if test="param.operationUserId == null or param.operationUserId == ''">
1 = 1
</if>
<if test="param.operationUserId == '14'">
cpa.status_type = '3'
AND cpa.status_type = '3'
</if>
<if test="param.operationUserId in ('57','29','55','56','67')">
cpa.status_type = '4'
AND cpa.status_type = '4'
</if>
<if test="!(param.operationUserId == null
or param.operationUserId == ''
or param.operationUserId == '14'
or param.operationUserId in ('57','29','55','56','67'))">
1 = 0
AND 1 = 0
</if>
)
<if test="param.keyWord != null and param.keyWord != ''">
AND pu.NAME LIKE CONCAT('%', #{param.keyWord}, '%')
</if>
)
)
UNION ALL
UNION ALL
(
SELECT
cpo.id AS id,
(
SELECT
cpa.id AS id,
cpa.code AS number,
'派车计划' AS processName,
CASE cpo.type
@ -151,11 +147,11 @@ SELECT
NULL AS definitionId,
cpo.status AS isFinish,
'OUT' AS source
FROM
FROM
car_plan_out cpo
LEFT JOIN pm_user pu ON pu.id = cpo.creator
LEFT JOIN car_plan_apply cpa ON cpo.apply_id = cpa.id
WHERE
LEFT JOIN pm_user pu ON pu.id = cpo.creator
LEFT JOIN car_plan_apply cpa ON cpo.apply_id = cpa.id
WHERE
1 = 1
<if test="param.operationUserId in ('57','29','55','56','67')">
AND cpo.status = '0'
@ -168,14 +164,14 @@ WHERE
or param.operationUserId == ''
or param.operationUserId in ('49','50')
or param.operationUserId in ('57','29','55','56','67'))">
1 = 0
AND 1 = 0
</if>
<if test="param.keyWord != null and param.keyWord != ''">
AND pu.NAME LIKE CONCAT('%', #{param.keyWord}, '%')
</if>
)
)
ORDER BY id DESC
ORDER BY id DESC
</select>