From f4bd00b4fb8c94b8755701ec84a2094f1cab4d56 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Thu, 10 Jul 2025 18:54:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/scrap/scrapAppointList.jsp | 19 ++++++---- WebContent/static/js/scrap/scrapAppoint.js | 5 +++ .../repairCheck/RepairCheckDetailsMapper.xml | 8 +++- .../mybatis/rm/ReturnMaterialTaskMapper.xml | 3 ++ .../mybatis/scrap/ScrapDetailsMapper.xml | 12 +++++- .../bonus/scrap/beans/ScrapDetailsBean.java | 38 +++++++++++++++++++ .../controller/ScrapDetailsController.java | 5 +++ .../scrap/service/ScrapDetailsServiceImp.java | 2 +- 8 files changed, 81 insertions(+), 11 deletions(-) diff --git a/WebContent/WEB-INF/views/scrap/scrapAppointList.jsp b/WebContent/WEB-INF/views/scrap/scrapAppointList.jsp index 64021e2..4f86d41 100644 --- a/WebContent/WEB-INF/views/scrap/scrapAppointList.jsp +++ b/WebContent/WEB-INF/views/scrap/scrapAppointList.jsp @@ -51,17 +51,22 @@ - - + - - - - - + + + + + + + + + + diff --git a/WebContent/static/js/scrap/scrapAppoint.js b/WebContent/static/js/scrap/scrapAppoint.js index ccae900..381ff9e 100644 --- a/WebContent/static/js/scrap/scrapAppoint.js +++ b/WebContent/static/js/scrap/scrapAppoint.js @@ -79,6 +79,7 @@ function getbaseList(init) { html += ""; html += ""; html += ""; + html += ""; if(l.scrapPerson == "" || l.scrapPerson == null){ l.scrapPerson = "尚未指派"; html += ""; @@ -93,7 +94,11 @@ function getbaseList(init) { } html += ""; + html += ""; + html += ""; html += ""; + html += ""; + html += ""; html += rowFunction(l.scrapPersonId,l.id,l.isActive); html += ""; } diff --git a/resources/mybatis/repairCheck/RepairCheckDetailsMapper.xml b/resources/mybatis/repairCheck/RepairCheckDetailsMapper.xml index bab0a2f..4331ce7 100644 --- a/resources/mybatis/repairCheck/RepairCheckDetailsMapper.xml +++ b/resources/mybatis/repairCheck/RepairCheckDetailsMapper.xml @@ -115,7 +115,9 @@ (sum( IFNULL(ROUND(wrc.ALCHECK_NUM),0) ) + sum( IFNULL(ROUND(wrc.ALSCRAP_NUM),0))) AS checkNum, mt.IS_COUNT AS isCount, - GROUP_CONCAT(DISTINCT wrc.REPAIR_ID) as repairIds + GROUP_CONCAT(DISTINCT wrc.REPAIR_ID) as repairIds, + MAX(wrc.CHECK_TIME) AS checkTime, + MAX(wrc.OPERATION_TIME) AS repairTime FROM wf_repair_check wrc LEFT JOIN mm_type mt ON mt.ID = wrc.MODEL_ID @@ -133,6 +135,10 @@ GROUP BY wrc.MODEL_ID )a WHERE a.checkNum > 0 + + AND LEFT(a.checkTime,10) BETWEEN #{startTime} and #{endTime} + + ORDER BY a.checkTime desc diff --git a/resources/mybatis/rm/ReturnMaterialTaskMapper.xml b/resources/mybatis/rm/ReturnMaterialTaskMapper.xml index a534ef2..7f4a550 100644 --- a/resources/mybatis/rm/ReturnMaterialTaskMapper.xml +++ b/resources/mybatis/rm/ReturnMaterialTaskMapper.xml @@ -81,6 +81,9 @@ WHERE wtr.IS_ACTIVE = 1 AND wtr.PROCESS_ID = 3 AND wtr.DEFINITION_ID = 8 AND wtr.IS_FINISH = #{isFinish} AND wtr.CHECKER_ID = #{checkerId} + + AND LEFT(wtr.OPERATION_TIME,10) BETWEEN #{startTime} and #{endTime} + ORDER BY wtr.OPERATION_TIME DESC diff --git a/resources/mybatis/scrap/ScrapDetailsMapper.xml b/resources/mybatis/scrap/ScrapDetailsMapper.xml index 8e9ee8b..8538f92 100644 --- a/resources/mybatis/scrap/ScrapDetailsMapper.xml +++ b/resources/mybatis/scrap/ScrapDetailsMapper.xml @@ -6,12 +6,18 @@ - update wf_scrap_details set SCRAP_PERSON = #{scrapPerson}, SCRAP_CHECKER = #{scrapPerson} + update wf_scrap_details set SCRAP_PERSON = #{scrapPerson}, SCRAP_CHECKER = #{scrapPerson},SPECIFY_TIME=NOW(),ASSIGNER=#{userId} where ID = #{id} @@ -281,6 +287,7 @@ SUM(wsd.SCRAP_NUM) as scrap, SUM(wsd.ALSCRAP_NUM) as alScrapNum , mt.IS_COUNT as isCount, + wsd.SCRAP_TIME as scrapTime, 0 as isFinish FROM wf_scrap_details wsd @@ -296,6 +303,7 @@ GROUP BY wsd.MODEL_ID HAVING alScrapNum > 0 + ORDER BY wsd.SCRAP_TIME DESC diff --git a/src/com/bonus/scrap/beans/ScrapDetailsBean.java b/src/com/bonus/scrap/beans/ScrapDetailsBean.java index c5fe8e9..142a2df 100644 --- a/src/com/bonus/scrap/beans/ScrapDetailsBean.java +++ b/src/com/bonus/scrap/beans/ScrapDetailsBean.java @@ -54,6 +54,20 @@ public class ScrapDetailsBean { private ScrapDetailsBean[] arr; private float paraNum; + + /** + * 指派时间 + */ + private String specifyTime; + /** + * 指派人 + */ + private String assigner; + /** + * 来源 + */ + private String source; + public String getUserId() { return userId; @@ -423,4 +437,28 @@ public class ScrapDetailsBean { this.paraNum = paraNum; } + public String getSpecifyTime() { + return specifyTime; + } + + public void setSpecifyTime(String specifyTime) { + this.specifyTime = specifyTime; + } + + public String getAssigner() { + return assigner; + } + + public void setAssignere(String assigner) { + this.assigner = assigner; + } + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + } diff --git a/src/com/bonus/scrap/controller/ScrapDetailsController.java b/src/com/bonus/scrap/controller/ScrapDetailsController.java index 80c7407..3f5347c 100644 --- a/src/com/bonus/scrap/controller/ScrapDetailsController.java +++ b/src/com/bonus/scrap/controller/ScrapDetailsController.java @@ -16,6 +16,8 @@ import com.bonus.sys.AjaxRes; import com.bonus.sys.BaseController; import com.bonus.sys.GlobalConst; import com.bonus.sys.Page; +import com.bonus.sys.UserShiroHelper; +import com.bonus.sys.beans.UserBean; import com.sun.java_cup.internal.runtime.virtual_parse_stack; @Controller @@ -51,6 +53,9 @@ public class ScrapDetailsController extends BaseController { public AjaxRes update(ScrapDetailsBean o) { AjaxRes ar = getAjaxRes(); try { + UserBean user = UserShiroHelper.getRealCurrentUser(); + int userId = user.getId(); + o.setUserId(userId+""); service.update(o); ar.setSucceedMsg(GlobalConst.SAVE_SUCCEED); } catch (Exception e) { diff --git a/src/com/bonus/scrap/service/ScrapDetailsServiceImp.java b/src/com/bonus/scrap/service/ScrapDetailsServiceImp.java index af599dd..2b373e4 100644 --- a/src/com/bonus/scrap/service/ScrapDetailsServiceImp.java +++ b/src/com/bonus/scrap/service/ScrapDetailsServiceImp.java @@ -267,7 +267,7 @@ public class ScrapDetailsServiceImp extends BaseServiceImp imp // 修改维修报废数据 scrap_num + paraScrapNum, is_sure = 1 mtBean.setThisScrapNum(paraScrapNum); mtBean.setIsSure("1"); - mtBean.setScrapTime(DateTimeHelper.getNowDate()); + mtBean.setScrapTime(DateTimeHelper.getNowTime()); res = dao.updateScrapDetails(mtBean); if (res == 0) {
+ 选择 序号序号 机具类型 机具规格机具数量报废人检验人申请时间操作机具数量报废来源报废人检验人指派人指派时间申请时间完成时间完成状态操作
"+ JY.Object.notEmpty(l.typeName) + ""+ JY.Object.notEmpty(l.modelName) + ""+ JY.Object.notEmpty(l.scrapNum) + ""+ JY.Object.notEmpty(l.source) + "" + l.scrapPerson + ""+ JY.Object.notEmpty(l.scrapChecker) + ""+ JY.Object.notEmpty(l.assigner) + ""+ JY.Object.notEmpty(l.specifyTime) + ""+ JY.Object.notEmpty(l.operationTime) + "" + (l.isSure === "1" ? JY.Object.notEmpty(l.scrapTime) : "") + "" + (l.isSure === "1" ? "已完成" : "未完成") + "