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

Merge remote-tracking branch 'coding/main' into 0620

This commit is contained in:
syruan 2025-07-10 18:01:17 +08:00
parent a79edd5765 61c2a74d6f
commit 06eeeb01c7
3 changed files with 179 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,8 @@
<c:choose>
<c:when test="${page.totalRecord > 0}">
<c:forEach items="${page.results}" var="ma" varStatus="index">
<tr ondblclick="setChecked(${ma.id})">
<tr ondblclick="setChecked(${ma.id})" onclick="topage(${ma.id} , '${ma.processName}')">
<th style="vertical-align:middle;" class="center">${(page.pageNum-1)*page.pageSize+index.index+1}</th>
<%-- <th style="vertical-align:middle;" class="center">
${ma.unitName}

50
WebContent/WEB-INF/views/rm/unFinishWorkList.jsp
View File

@ -3,18 +3,18 @@
<!DOCTYPE html >
<html lang="en">
<head>
<%@include file="../baseset.jsp" %>
<%@include file="../systemset.jsp" %>
<link rel="stylesheet" href="${bonuspath}/static/plugins/zTree/3.5/zTreeStyle.css" />
<script src="${bonuspath}/static/plugins/zTree/3.5/jquery.ztree.all.min.js"></script>
<style type="text/css">
<%@include file="../baseset.jsp" %>
<%@include file="../systemset.jsp" %>
<link rel="stylesheet" href="${bonuspath}/static/plugins/zTree/3.5/zTreeStyle.css" />
<script src="${bonuspath}/static/plugins/zTree/3.5/jquery.ztree.all.min.js"></script>
<style type="text/css">
.orgTree {
width:100% !important;
height:500px !important;
background: none repeat scroll 0 0 #fff !important;
border:1px solid #ddd !important
}
</style>
</style>
</head>
<body>
<div class="page-content">
@ -67,9 +67,9 @@
<%@include file="../dialog.jsp" %>
</div>
</div>
</div>
</div>
<script type="text/javascript">
function edit(id,definitionId){
function edit(id,definitionId){
cleanForm();
$.ajax({
type : 'POST',
@ -91,22 +91,34 @@ function edit(id,definitionId){
},
dataType : 'json'
});
}
$(function() {
}
document.addEventListener("visibilitychange", function () {
if (document.visibilityState === "visible") {
refreshTable(); // 页面激活时刷新表格
}
});
function refreshTable() {
console.log("页面重新激活，刷新任务列表...");
getbaseList(1); // 重新请求表格数据
}
$(function() {
getbaseList(1);
$("#keyWord").keydown(function(e) {
keycode = e.which || e.keyCode;
if (keycode == 13) {
search();
}
});
});
});
function search(){
function search(){
$("#search").trigger("click");
}
}
function getbaseList(init) {
function getbaseList(init) {
var isFinish =$("#isFinish").val();
var data = {pageNum:init};
data = {pageNum:init,pageSize:10 };
@ -131,8 +143,8 @@ function getbaseList(init) {
console.log("ajax请求错误!");
}
})
}
function cleanForm() {
}
function cleanForm() {
$("#auForm input[id$='unitName']").val("");
$("#auForm input[id$='projectName']").val("");
$("#auForm input[id$='taskName']").val("");
@ -143,8 +155,8 @@ function cleanForm() {
$("#auForm input[id$='testLoad']").val("");
$("#auForm input[id$='holdingTime']").val("");
$("#auForm input[id$='operaTionName']").val("");
}
function assignment(data){
}
function assignment(data){
$("#auForm input[id$='unitName']").val(data.unitName);
$("#auForm input[id$='projectName']").val(data.projectName);
$("#auForm input[id$='taskName']").val(data.taskName);
@ -155,7 +167,7 @@ function assignment(data){
$("#auForm input[id$='testLoad']").val(data.testLoad);
$("#auForm input[id$='holdingTime']").val(data.holdingTime);
$("#auForm input[id$='operaTionName']").val(data.operaTionName);
}
}
</script>
</body>
</html>

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

@ -113,18 +113,17 @@
WHERE
cpa.status = '1'
<if test="param.operationUserId == '14'">
AND cpa.status_type = '3'
</if>
<if test="param.operationUserId in ('57','29','55','56','67')">
<choose>
<when test="param.operationUserId == '14'">
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'))">
</when>
<when test="param.operationUserId == '84' or param.operationUserId == '85'">
AND cpa.status_type = '3'
</when>
<otherwise>
AND 1 = 0
</if>
</otherwise>
</choose>
<if test="param.keyWord != null and param.keyWord != ''">
AND pu.NAME LIKE CONCAT('%', #{param.keyWord}, '%')
</if>
@ -151,24 +150,22 @@
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
1 = 1
<if test="param.operationUserId in ('57','29','55','56','67')">
AND cpo.status = '0'
</if>
<if test="param.operationUserId in ('49','50')">
<where>
<choose>
<when test="param.operationUserId == '57' or param.operationUserId == '29' or param.operationUserId == '55' or param.operationUserId == '56' or param.operationUserId == '67'">
AND cpa.status_type = '0'
</when>
<when test="param.operationUserId == '49' or param.operationUserId == '50'">
AND cpo.status = '1'
</if>
<if test="!(param.operationUserId == null
or param.operationUserId == ''
or param.operationUserId in ('49','50')
or param.operationUserId in ('57','29','55','56','67'))">
</when>
<otherwise>
AND 1 = 0
</if>
</otherwise>
</choose>
<if test="param.keyWord != null and param.keyWord != ''">
AND pu.NAME LIKE CONCAT('%', #{param.keyWord}, '%')
</if>
</where>
)
ORDER BY id DESC