From fe7722020dd32c50b7207c7dfb1678fa0a073ace Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Wed, 16 Jul 2025 21:20:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BE=85=E5=8A=9E=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E9=80=82=E9=85=8D-=E4=BC=98=E5=8C=96sql?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/rm/unFinishWorkList.jsp | 18 ++-- resources/mybatis/wf/TaskRecordMapper.xml | 10 +- .../ReturnMaterialTaskRecordController.java | 92 +++++++++---------- src/com/bonus/sys/Page.java | 6 +- 4 files changed, 58 insertions(+), 68 deletions(-) diff --git a/WebContent/WEB-INF/views/rm/unFinishWorkList.jsp b/WebContent/WEB-INF/views/rm/unFinishWorkList.jsp index 7152345..5306a4d 100644 --- a/WebContent/WEB-INF/views/rm/unFinishWorkList.jsp +++ b/WebContent/WEB-INF/views/rm/unFinishWorkList.jsp @@ -80,11 +80,11 @@ console.log('当前URL:', window.location.href); // 检测移动端并跳转 - var isMobile = MobileDetect.isMobile(); + const isMobile = MobileDetect.isMobile(); console.log('移动端检测结果:', isMobile); if (isMobile) { - var currentUrl = window.location.href; + const currentUrl = window.location.href; console.log('当前URL分析:', currentUrl); // 避免无限重定向 - 检查是否已经在移动端页面 @@ -94,11 +94,11 @@ } // 构建移动端页面URL - var baseUrl = currentUrl.split('?')[0]; // 去掉查询参数 - var queryParams = currentUrl.split('?')[1] || ''; // 保留查询参数 + const baseUrl = currentUrl.split('?')[0]; // 去掉查询参数 + const queryParams = currentUrl.split('?')[1] || ''; // 保留查询参数 // 将 show 替换为 showMobile - var mobileUrl = baseUrl.replace('/show', '/showMobile'); + let mobileUrl = baseUrl.replace('/show', '/showMobile'); if (queryParams) { mobileUrl += '?' + queryParams; } @@ -109,7 +109,6 @@ setTimeout(function() { window.location.href = mobileUrl; }, 100); - return; } else { console.log('桌面设备，不进行跳转'); } @@ -149,9 +148,8 @@ console.log("页面重新激活，刷新任务列表..."); getbaseList(1); // 重新请求表格数据 } + $(function() { - - // 获取所有选中的 value（你可以绑定按钮触发） $('#getSelectedBtn').on('click', function () { let selectedValues = $('.rowCheck:checked') @@ -164,7 +162,6 @@ } console.log("selectedValues:", selectedValues); - $.ajax({ type: 'POST', url: bonuspath + '/backstage/rm/taskRecord/batchApproval', @@ -191,8 +188,6 @@ $('#isFinish').change(function () { toggleButton(); }); - - $('.rowCheck').prop('checked', false); // 取消所有 rowCheck 的选中状态 $('#checkAll').prop('checked', false); // 如果你还有全选框，也一并清除 }); @@ -263,6 +258,7 @@ } }) } + function cleanForm() { $("#auForm input[id$='unitName']").val(""); $("#auForm input[id$='projectName']").val(""); diff --git a/resources/mybatis/wf/TaskRecordMapper.xml b/resources/mybatis/wf/TaskRecordMapper.xml index ac8d9cd..ad4aee8 100644 --- a/resources/mybatis/wf/TaskRecordMapper.xml +++ b/resources/mybatis/wf/TaskRecordMapper.xml @@ -95,7 +95,7 @@ OR (wtr.DEFINITION_ID != 11 AND wtr.IS_FINISH = #{param.isFinish}) ) AND wtr.IS_ACTIVE = 1 - + AND wtr.OPERATION_USER = #{param.operationUserId} @@ -127,7 +127,7 @@ WHERE cpa.status = '1' - + AND cpa.status_type = '4' @@ -135,7 +135,7 @@ AND cpa.status_type = '1' - + AND cpa.status_type = '3' @@ -176,7 +176,7 @@ LEFT JOIN car_plan_apply cpa ON cpo.apply_id = cpa.id - + AND cpo.status = 0 @@ -184,7 +184,7 @@ AND cpo.status in (1, 2) - + AND cpo.status = '1' diff --git a/src/com/bonus/rm/controller/ReturnMaterialTaskRecordController.java b/src/com/bonus/rm/controller/ReturnMaterialTaskRecordController.java index 6f50bba..7b1de36 100644 --- a/src/com/bonus/rm/controller/ReturnMaterialTaskRecordController.java +++ b/src/com/bonus/rm/controller/ReturnMaterialTaskRecordController.java @@ -65,7 +65,8 @@ public class ReturnMaterialTaskRecordController extends BaseController page,HttpServletRequest request,TaskRecordBean o,Model model, HttpSession sess) { try { String a = request.getParameter("isFinish"); - String userId = UserShiroHelper.getRealCurrentUser().getId() + ""; + Integer userId = UserShiroHelper.getCurrentUser().getId(); + System.out.println("当前登陆userId:"+userId); // UserBean user = UserShiroHelper.getRealCurrentUser(); // page.setUser(user); page.setIsFinish(a); @@ -83,6 +84,46 @@ public class ReturnMaterialTaskRecordController extends BaseController page, HttpServletRequest request, + TaskRecordBean o) { + AjaxRes ar = getAjaxRes(); + try { + String isFinish = request.getParameter("isFinish"); + Integer userId = UserShiroHelper.getCurrentUser().getId(); + + page.setIsFinish(isFinish); + if (1 != userId) { + page.setOperationUserId(userId); + } + + // 调用服务获取数据 + Page result = service.findUnFinishContent(page, o); + + // 构造移动端响应数据 + Map data = new HashMap(); + data.put("data", result.getResults()); + + // 分页信息 + Map pagination = new HashMap(); + pagination.put("currentPage", result.getPageNum()); + pagination.put("totalPages", result.getTotalPage()); + pagination.put("totalRecords", result.getTotalRecord()); + pagination.put("pageSize", result.getPageSize()); + data.put("pagination", pagination); + + ar.setSucceed(data); + } catch (Exception e) { + e.printStackTrace(); + logger.error(e.toString(), e); + ar.setFailMsg("获取任务列表失败"); + } + return ar; + } + @RequestMapping(value = "findByPage", method = RequestMethod.POST) @ResponseBody public AjaxRes findByPage(Page page, ReturnMaterialTaskRecordBean o) { @@ -164,60 +205,17 @@ public class ReturnMaterialTaskRecordController extends BaseController page, HttpServletRequest request, - TaskRecordBean o) { - AjaxRes ar = getAjaxRes(); - try { - String isFinish = request.getParameter("isFinish"); - String userId = UserShiroHelper.getRealCurrentUser().getId() + ""; - - page.setIsFinish(isFinish); - if (!"1".equals(userId)) { - page.setOperationUserId(userId); - } - - // 调用服务获取数据 - Page result = service.findUnFinishContent(page, o); - - // 构造移动端响应数据 - Map data = new HashMap(); - data.put("data", result.getResults()); - - // 分页信息 - Map pagination = new HashMap(); - pagination.put("currentPage", result.getPageNum()); - pagination.put("totalPages", result.getTotalPage()); - pagination.put("totalRecords", result.getTotalRecord()); - pagination.put("pageSize", result.getPageSize()); - data.put("pagination", pagination); - - ar.setSucceed(data); - } catch (Exception e) { - e.printStackTrace(); - logger.error(e.toString(), e); - ar.setFailMsg("获取任务列表失败"); - } - return ar; - } - - // 待办详情 //待办详情 @RequestMapping(value = "findUnFinishContentDetails", method = RequestMethod.POST) @ResponseBody public List findUnFinishContentDetails(ReturnMaterialTaskRecordBean o) { List list = new ArrayList(); try { - - list = service.findUnFinishContentDetails(o); } catch (Exception e) { logger.error(e.toString(), e); @@ -225,10 +223,6 @@ public class ReturnMaterialTaskRecordController extends BaseController page, HttpServletRequest request, HttpServletResponse response, ReturnMaterialTaskRecordBean o) { diff --git a/src/com/bonus/sys/Page.java b/src/com/bonus/sys/Page.java index 3227dc0..2b48d3d 100644 --- a/src/com/bonus/sys/Page.java +++ b/src/com/bonus/sys/Page.java @@ -22,13 +22,13 @@ public class Page { private String isFinish; private String keyWord; - private String operationUserId; + private Integer operationUserId; - public String getOperationUserId() { + public Integer getOperationUserId() { return operationUserId; } - public void setOperationUserId(String operationUserId) { + public void setOperationUserId(Integer operationUserId) { this.operationUserId = operationUserId; }