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:choose>
<c:when test="${page.totalRecord > 0}"> <c:when test="${page.totalRecord > 0}">
<c:forEach items="${page.results}" var="ma" varStatus="index"> <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">${(page.pageNum-1)*page.pageSize+index.index+1}</th>
<%-- <th style="vertical-align:middle;" class="center"> <%-- <th style="vertical-align:middle;" class="center">
${ma.unitName} ${ma.unitName}

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

@ -3,159 +3,171 @@
<!DOCTYPE html > <!DOCTYPE html >
<html lang="en"> <html lang="en">
<head> <head>
<%@include file="../baseset.jsp" %> <%@include file="../baseset.jsp" %>
<%@include file="../systemset.jsp" %> <%@include file="../systemset.jsp" %>
<link rel="stylesheet" href="${bonuspath}/static/plugins/zTree/3.5/zTreeStyle.css" /> <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> <script src="${bonuspath}/static/plugins/zTree/3.5/jquery.ztree.all.min.js"></script>
<style type="text/css"> <style type="text/css">
.orgTree { .orgTree {
width:100% !important; width:100% !important;
height:500px !important; height:500px !important;
background: none repeat scroll 0 0 #fff !important; background: none repeat scroll 0 0 #fff !important;
border:1px solid #ddd !important border:1px solid #ddd !important
} }
</style> </style>
</head> </head>
<body> <body>
<div class="page-content"> <div class="page-content">
<div class="row-fluid"> <div class="row-fluid">
<div class="col-xs-12"> <div class="col-xs-12">
<form id="baseForm" class="form-inline" method="POST" onsubmit="return false;"> <form id="baseForm" class="form-inline" method="POST" onsubmit="return false;">
<div class="row"> <div class="row">
<div class="widget-main"> <div class="widget-main">
&emsp;&nbsp;<font>任务状态：</font> &emsp;&nbsp;<font>任务状态：</font>
<select id="isFinish" name="isFinishs"> <select id="isFinish" name="isFinishs">
<option selected="selected" value="0">待办</option> <option selected="selected" value="0">待办</option>
<option value="1">已办</option> <option value="1">已办</option>
</select> </select>
<input type="text" id="keyWord" name="keyWord" placeholder="这里输入关键词" class="input-large"> <input type="text" id="keyWord" name="keyWord" placeholder="这里输入关键词" class="input-large">
<button id='searchBtn' class="btn btn-warning btn-sm" title="过滤" type="button" onclick="getbaseList(1)"><i class="icon-search bigger-110 icon-only"></i></button> <button id='searchBtn' class="btn btn-warning btn-sm" title="过滤" type="button" onclick="getbaseList(1)"><i class="icon-search bigger-110 icon-only"></i></button>
</div>
</div> </div>
<input type='hidden' class='pageNum' name='pageNum' value='1'/> </div>
<input type='hidden' class='pageSize' name='pageSize' value='10'/> <input type='hidden' class='pageNum' name='pageNum' value='1'/>
</form> <input type='hidden' class='pageSize' name='pageSize' value='10'/>
<table id="baseTable" class="table table-striped table-bordered table-hover" > </form>
<thead> <table id="baseTable" class="table table-striped table-bordered table-hover" >
<tr> <thead>
<th style="width:5%" class="center hidden-480">序号</th> <tr>
<!-- <th style="width:10%" class="center">单位名称</th> <th style="width:5%" class="center hidden-480">序号</th>
<th style="width:15%" class="center">工程名称</th> <!-- <th style="width:10%" class="center">单位名称</th>
<th style="width:10%" class="center">任务单号</th> --> <th style="width:15%" class="center">工程名称</th>
<th style="width:15%" class="center">任务名称</th> <th style="width:10%" class="center">任务单号</th> -->
<th style="width:10%" class="center">创建时间</th> <th style="width:15%" class="center">任务名称</th>
<th style="width:10%" class="center">任务单号</th> <th style="width:10%" class="center">创建时间</th>
<th style="width:10%" class="center">创建人</th> <th style="width:10%" class="center">任务单号</th>
<th style="width:10%" class="center">任务情况</th> <th style="width:10%" class="center">创建人</th>
<!-- <th style="width:10%" class="center">操作</th> --> <th style="width:10%" class="center">任务情况</th>
</tr> <!-- <th style="width:10%" class="center">操作</th> -->
</thead> </tr>
<tbody></tbody> </thead>
</table> <tbody></tbody>
<div class="row"> </table>
<div class="col-sm-4"> <div class="row">
</div> <div class="col-sm-4">
<div class="col-sm-8"> </div>
<!--设置分页位置--> <div class="col-sm-8">
<div id="pageing" class="dataTables_paginate paging_bootstrap" > <!--设置分页位置-->
<ul class="pagination"></ul> <div id="pageing" class="dataTables_paginate paging_bootstrap" >
</div> <ul class="pagination"></ul>
</div>
</div> </div>
</div>
</div>
<!-- #dialog-confirm --> <!-- #dialog-confirm -->
<%@include file="unFinishWorkListDetails.jsp" %> <%@include file="unFinishWorkListDetails.jsp" %>
<%@include file="../dialog.jsp" %> <%@include file="../dialog.jsp" %>
</div>
</div> </div>
</div> </div>
</div>
<script type="text/javascript"> <script type="text/javascript">
function edit(id,definitionId){ function edit(id,definitionId){
cleanForm(); cleanForm();
$.ajax({ $.ajax({
type : 'POST', type : 'POST',
url : bonuspath + '/backstage/rm/taskRecord/findUnFinishContentDetails', url : bonuspath + '/backstage/rm/taskRecord/findUnFinishContentDetails',
data : { data : {
id:id, id:id,
definitionId: definitionId definitionId: definitionId
}, },
success : function(data) { success : function(data) {
JY.Model.check("auDiv"); JY.Model.check("auDiv");
var list = data[0]; var list = data[0];
console.log("##########"); console.log("##########");
console.log(list); console.log(list);
console.log("##########"); console.log("##########");
assignment(list); assignment(list);
}, },
error : function(e) { error : function(e) {
}, },
dataType : 'json' dataType : 'json'
}); });
}
$(function() {
getbaseList(1);
$("#keyWord").keydown(function(e) {
keycode = e.which || e.keyCode;
if (keycode == 13) {
search();
}
});
});
function search(){
$("#search").trigger("click");
}
function getbaseList(init) {
var isFinish =$("#isFinish").val();
var data = {pageNum:init};
data = {pageNum:init,pageSize:10 };
var keyWord = $("#keyWord").val();
console.log("keyw=",keyWord);
if(JY.Object.notNull(keyWord)){
data.keyWord = keyWord;
} }
data = Object.assign(data,obj);
JY.Model.loading(); document.addEventListener("visibilitychange", function () {
$.ajax({ if (document.visibilityState === "visible") {
type:"POST", refreshTable(); // 页面激活时刷新表格
url:bonuspath +'/backstage/rm/taskRecord/findUnFinishContent?isFinish='+isFinish,
data: JSON.stringify(data ),
dataType:"html",
contentType:"application/json",
success:function(data){
$("#baseTable tbody").html(data);
JY.Model.loadingClose();
},
error:function(data){
console.log("ajax请求错误!");
} }
}) });
}
function cleanForm() {
$("#auForm input[id$='unitName']").val("");
$("#auForm input[id$='projectName']").val("");
$("#auForm input[id$='taskName']").val("");
$("#auForm input[id$='agreementCode']").val("");
$("#auForm input[id$='personName']").val(""); function refreshTable() {
$("#auForm input[id$='createTime']").val(""); console.log("页面重新激活，刷新任务列表...");
$("#auForm input[id$='testLoad']").val(""); getbaseList(1); // 重新请求表格数据
$("#auForm input[id$='holdingTime']").val(""); }
$("#auForm input[id$='operaTionName']").val(""); $(function() {
} getbaseList(1);
function assignment(data){
$("#auForm input[id$='unitName']").val(data.unitName);
$("#auForm input[id$='projectName']").val(data.projectName);
$("#auForm input[id$='taskName']").val(data.taskName);
$("#auForm input[id$='agreementCode']").val(data.agreementCode);
$("#auForm input[id$='personName']").val(data.personName); $("#keyWord").keydown(function(e) {
$("#auForm input[id$='createTime']").val(data.createTime); keycode = e.which || e.keyCode;
$("#auForm input[id$='testLoad']").val(data.testLoad); if (keycode == 13) {
$("#auForm input[id$='holdingTime']").val(data.holdingTime); search();
$("#auForm input[id$='operaTionName']").val(data.operaTionName); }
} });
});
function search(){
$("#search").trigger("click");
}
function getbaseList(init) {
var isFinish =$("#isFinish").val();
var data = {pageNum:init};
data = {pageNum:init,pageSize:10 };
var keyWord = $("#keyWord").val();
console.log("keyw=",keyWord);
if(JY.Object.notNull(keyWord)){
data.keyWord = keyWord;
}
data = Object.assign(data,obj);
JY.Model.loading();
$.ajax({
type:"POST",
url:bonuspath +'/backstage/rm/taskRecord/findUnFinishContent?isFinish='+isFinish,
data: JSON.stringify(data ),
dataType:"html",
contentType:"application/json",
success:function(data){
$("#baseTable tbody").html(data);
JY.Model.loadingClose();
},
error:function(data){
console.log("ajax请求错误!");
}
})
}
function cleanForm() {
$("#auForm input[id$='unitName']").val("");
$("#auForm input[id$='projectName']").val("");
$("#auForm input[id$='taskName']").val("");
$("#auForm input[id$='agreementCode']").val("");
$("#auForm input[id$='personName']").val("");
$("#auForm input[id$='createTime']").val("");
$("#auForm input[id$='testLoad']").val("");
$("#auForm input[id$='holdingTime']").val("");
$("#auForm input[id$='operaTionName']").val("");
}
function assignment(data){
$("#auForm input[id$='unitName']").val(data.unitName);
$("#auForm input[id$='projectName']").val(data.projectName);
$("#auForm input[id$='taskName']").val(data.taskName);
$("#auForm input[id$='agreementCode']").val(data.agreementCode);
$("#auForm input[id$='personName']").val(data.personName);
$("#auForm input[id$='createTime']").val(data.createTime);
$("#auForm input[id$='testLoad']").val(data.testLoad);
$("#auForm input[id$='holdingTime']").val(data.holdingTime);
$("#auForm input[id$='operaTionName']").val(data.operaTionName);
}
</script> </script>
</body> </body>
</html> </html>

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

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