From 1116e9bf7427c48d172041122d96c4ccb4a660b0 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Mon, 30 Jan 2023 11:21:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=B4=9F=E8=8D=B7?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E9=99=A4=E6=95=B0=E4=B8=BA0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/ReportMapper.xml | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index 97f6d3f8..eaad20ba 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -1498,14 +1498,14 @@ SELECT CF.VALUE "weekCapacity",WIP.*, WIP.RESOURCE_TYPE_DESCRIPTION "DESCRIPTION", WIP.WORK_CENTER_DESCRIPTION "workCenterDescription", - TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."unWorkHours1" / CF.VALUE) * 100, '99990.99') || '%' "weekRate1", - TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."unWorkHours2" / CF.VALUE) * 100, '99990.99') || '%' "weekRate2", - TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."unWorkHours3" / CF.VALUE) * 100, '99990.99') || '%' "weekRate3", - TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."unWorkHours4" / CF.VALUE) * 100, '99990.99') || '%' "weekRate4", - TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."unWorkHours5" / CF.VALUE) * 100, '99990.99') || '%' "weekRate5", - TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."unWorkHours6" / CF.VALUE) * 100, '99990.99') || '%' "weekRate6", - TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."unWorkHours7" / CF.VALUE) * 100, '99990.99') || '%' "weekRate7", - TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."unWorkHours8" / CF.VALUE) * 100, '99990.99') || '%' "weekRate8" + TO_CHAR(DECODE(CF.VALUE,0,0,NULL,0, WIP."unWorkHours1" / CF.VALUE) * 100, '99990.99') || '%' "weekRate1", + TO_CHAR(DECODE(CF.VALUE,0,0,NULL,0, WIP."unWorkHours2" / CF.VALUE) * 100, '99990.99') || '%' "weekRate2", + TO_CHAR(DECODE(CF.VALUE,0,0,NULL,0, WIP."unWorkHours3" / CF.VALUE) * 100, '99990.99') || '%' "weekRate3", + TO_CHAR(DECODE(CF.VALUE,0,0,NULL,0, WIP."unWorkHours4" / CF.VALUE) * 100, '99990.99') || '%' "weekRate4", + TO_CHAR(DECODE(CF.VALUE,0,0,NULL,0, WIP."unWorkHours5" / CF.VALUE) * 100, '99990.99') || '%' "weekRate5", + TO_CHAR(DECODE(CF.VALUE,0,0,NULL,0, WIP."unWorkHours6" / CF.VALUE) * 100, '99990.99') || '%' "weekRate6", + TO_CHAR(DECODE(CF.VALUE,0,0,NULL,0, WIP."unWorkHours7" / CF.VALUE) * 100, '99990.99') || '%' "weekRate7", + TO_CHAR(DECODE(CF.VALUE,0,0,NULL,0, WIP."unWorkHours8" / CF.VALUE) * 100, '99990.99') || '%' "weekRate8" FROM (WITH WEEK AS ( SELECT TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') WEEK0, TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 1 WEEK1, @@ -1583,23 +1583,23 @@ CF.VALUE "monthCapacity", CFD.VALUE "dayCapacity", ZWIP.currentCompletedWorkHours "currentCompletedWorkHours", - TO_CHAR(DECODE(CF.VALUE, NULL, '0.00', ZWIP.currentCompletedWorkHours / CF.VALUE) * 100, '99990.99') || + TO_CHAR(DECODE(CF.VALUE,0,'0.00', NULL, '0.00', ZWIP.currentCompletedWorkHours / CF.VALUE) * 100, '99990.99') || '%' "currentCompletedRate", ZWIP.currentPlanWorkHours "currentPlanWorkHours", WIP.RESOURCE_TYPE_DESCRIPTION "DESCRIPTION", WIP.WORK_CENTER_DESCRIPTION "workCenterDescription", - TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."workHours1" / CF.VALUE) * 100, '99990.99') || '%' "monthRate1", - TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."workHours2" / CF.VALUE) * 100, '99990.99') || '%' "monthRate2", - TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."workHours3" / CF.VALUE) * 100, '99990.99') || '%' "monthRate3", - TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."workHours4" / CF.VALUE) * 100, '99990.99') || '%' "monthRate4", - TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."workHours5" / CF.VALUE) * 100, '99990.99') || '%' "monthRate5", - TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."workHours6" / CF.VALUE) * 100, '99990.99') || '%' "monthRate6", - TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."workHours7" / CF.VALUE) * 100, '99990.99') || '%' "monthRate7", - TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."workHours8" / CF.VALUE) * 100, '99990.99') || '%' "monthRate8", - TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."workHours9" / CF.VALUE) * 100, '99990.99') || '%' "monthRate9", - TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."workHours10" / CF.VALUE) * 100, '99990.99') || '%' "monthRate10", - TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."workHours11" / CF.VALUE) * 100, '99990.99') || '%' "monthRate11", - TO_CHAR(DECODE(CF.VALUE,NULL,0, WIP."workHours12" / CF.VALUE) * 100, '99990.99') || '%' "monthRate12" + TO_CHAR(DECODE(CF.VALUE,0,0,NULL,0, WIP."workHours1" / CF.VALUE) * 100, '99990.99') || '%' "monthRate1", + TO_CHAR(DECODE(CF.VALUE,0,0,NULL,0, WIP."workHours2" / CF.VALUE) * 100, '99990.99') || '%' "monthRate2", + TO_CHAR(DECODE(CF.VALUE,0,0,NULL,0, WIP."workHours3" / CF.VALUE) * 100, '99990.99') || '%' "monthRate3", + TO_CHAR(DECODE(CF.VALUE,0,0,NULL,0, WIP."workHours4" / CF.VALUE) * 100, '99990.99') || '%' "monthRate4", + TO_CHAR(DECODE(CF.VALUE,0,0,NULL,0, WIP."workHours5" / CF.VALUE) * 100, '99990.99') || '%' "monthRate5", + TO_CHAR(DECODE(CF.VALUE,0,0,NULL,0, WIP."workHours6" / CF.VALUE) * 100, '99990.99') || '%' "monthRate6", + TO_CHAR(DECODE(CF.VALUE,0,0,NULL,0, WIP."workHours7" / CF.VALUE) * 100, '99990.99') || '%' "monthRate7", + TO_CHAR(DECODE(CF.VALUE,0,0,NULL,0, WIP."workHours8" / CF.VALUE) * 100, '99990.99') || '%' "monthRate8", + TO_CHAR(DECODE(CF.VALUE,0,0,NULL,0, WIP."workHours9" / CF.VALUE) * 100, '99990.99') || '%' "monthRate9", + TO_CHAR(DECODE(CF.VALUE,0,0,NULL,0, WIP."workHours10" / CF.VALUE) * 100, '99990.99') || '%' "monthRate10", + TO_CHAR(DECODE(CF.VALUE,0,0,NULL,0, WIP."workHours11" / CF.VALUE) * 100, '99990.99') || '%' "monthRate11", + TO_CHAR(DECODE(CF.VALUE,0,0,NULL,0, WIP."workHours12" / CF.VALUE) * 100, '99990.99') || '%' "monthRate12" FROM ( WITH MONTH AS ( SELECT ADD_MONTHS(TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM'), 'yyyy-MM'), 'yyyy'), 0 - #{month}) month0, From 70896e96f9903a316bb9e071300edbbbb23bd568 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Mon, 30 Jan 2023 16:51:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update=20=E5=B7=A5=E6=97=B6=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ReportServiceImpl.java | 3 ++ .../main/resources/mapper/ReportMapper.xml | 38 +++++++++++++------ 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java index 846971d1..ade90da9 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java @@ -1475,11 +1475,14 @@ public class ReportServiceImpl implements ReportService { List> thisYearMapList = reportMapper.totalWorkingHoursCompletedThisYear(workCenter); ArrayList monthYearList = new ArrayList<>(); ArrayList workHorsList = new ArrayList<>(); + ArrayList planHorsList = new ArrayList<>(); for (Map map : thisYearMapList) { monthYearList.add(map.get("MONTH_MONTH")); + planHorsList.add(Float.valueOf(String.valueOf(map.get("PLAN_QTY")))); workHorsList.add(Float.valueOf(String.valueOf(map.get("QTY")))); } result.put("monthYearList",monthYearList); + result.put("planHorsList",planHorsList); result.put("workHorsList",workHorsList); //各车间总工时完成情况(单轴多折线图) diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index eaad20ba..f14e43ab 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -3250,44 +3250,60 @@ SELECT zab.CREATED_DATE_TIME, + SELECT FROM Z_OPER_LOG WHERE HANDLE=#{handle} + + + + + + + + + + + + + + + + + + + + + + INSERT INTO Z_OPER_LOG + + HANDLE, + SITE, + TITLE, + METHOD, + OPER_PARAM, + RESULT, + ERROR_MSG, + OPER_USER, + OPER_TIME, + VALUES + + #{handle}, + #{site}, + #{title}, + #{method}, + #{operParam}, + #{result}, + #{errorMsg}, + #{operUser}, + #{operTime}, + + + + + INSERT INTO Z_OPER_LOG + + + VALUES + + #{handle}, + #{site}, + #{title}, + #{method}, + #{operParam}, + #{result}, + #{errorMsg}, + #{operUser}, + #{operTime}, + + + + + + UPDATE Z_OPER_LOG + SITE=#{et.site}, + TITLE=#{et.title}, + METHOD=#{et.method}, + OPER_PARAM=#{et.operParam}, + RESULT=#{et.result}, + ERROR_MSG=#{et.errorMsg}, + OPER_USER=#{et.operUser}, + OPER_TIME=#{et.operTime}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_OPER_LOG + SITE=#{et.site}, + TITLE=#{et.title}, + METHOD=#{et.method}, + OPER_PARAM=#{et.operParam}, + RESULT=#{et.result}, + ERROR_MSG=#{et.errorMsg}, + OPER_USER=#{et.operUser}, + OPER_TIME=#{et.operTime}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_OPER_LOG + SITE=#{et.site}, + TITLE=#{et.title}, + METHOD=#{et.method}, + OPER_PARAM=#{et.operParam}, + RESULT=#{et.result}, + ERROR_MSG=#{et.errorMsg}, + OPER_USER=#{et.operUser}, + OPER_TIME=#{et.operTime}, + + + + + HANDLE=#{ew.entity.handle} + AND SITE=#{ew.entity.site} + AND TITLE=#{ew.entity.title} + AND METHOD=#{ew.entity.method} + AND OPER_PARAM=#{ew.entity.operParam} + AND RESULT=#{ew.entity.result} + AND ERROR_MSG=#{ew.entity.errorMsg} + AND OPER_USER=#{ew.entity.operUser} + AND OPER_TIME=#{ew.entity.operTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_OPER_LOG WHERE HANDLE=#{handle} + + + + DELETE FROM Z_OPER_LOG + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM Z_OPER_LOG + + + + + HANDLE=#{ew.entity.handle} + + AND SITE=#{ew.entity.site} + AND TITLE=#{ew.entity.title} + AND METHOD=#{ew.entity.method} + AND OPER_PARAM=#{ew.entity.operParam} + AND RESULT=#{ew.entity.result} + AND ERROR_MSG=#{ew.entity.errorMsg} + AND OPER_USER=#{ew.entity.operUser} + AND OPER_TIME=#{ew.entity.operTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_OPER_LOG WHERE HANDLE IN ( + #{item} + ) + + + +