From bced2444244b3a146618f4384b95a0221e086184 Mon Sep 17 00:00:00 2001 From: ALW <850658129@qq.com> Date: Thu, 8 Sep 2022 13:41:17 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BF=AE=E6=94=B92=E3=80=81=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8sql=E9=87=8D=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/emr/entity/V_Count.java | 30 +++ .../emr/service/ipml/V_CountServiceImpl.java | 16 +- src/main/resources/config/jdbc.properties | 2 +- src/main/resources/mapper/V_CountMapper.xml | 222 ++++-------------- .../WEB-INF/views/vCountDir/vCountList.jsp | 4 +- .../webapp/static/js/vCount/vCountList.js | 10 +- 6 files changed, 104 insertions(+), 180 deletions(-) diff --git a/src/main/java/com/emr/entity/V_Count.java b/src/main/java/com/emr/entity/V_Count.java index e46b112..6f7cb58 100644 --- a/src/main/java/com/emr/entity/V_Count.java +++ b/src/main/java/com/emr/entity/V_Count.java @@ -33,6 +33,36 @@ public class V_Count { private String endDate; + public Integer getDay2Num() { + return day2Num; + } + + public void setDay2Num(Integer day2Num) { + this.day2Num = day2Num; + } + + public Integer getDay3Num() { + return day3Num; + } + + public void setDay3Num(Integer day3Num) { + this.day3Num = day3Num; + } + + public Integer getDay7Num() { + return day7Num; + } + + public void setDay7Num(Integer day7Num) { + this.day7Num = day7Num; + } + + private Integer day2Num; + + private Integer day3Num; + + private Integer day7Num; + public String getDeptCode() { return deptCode; diff --git a/src/main/java/com/emr/service/ipml/V_CountServiceImpl.java b/src/main/java/com/emr/service/ipml/V_CountServiceImpl.java index 400091f..3adb1dd 100644 --- a/src/main/java/com/emr/service/ipml/V_CountServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/V_CountServiceImpl.java @@ -28,7 +28,21 @@ public class V_CountServiceImpl implements V_CountService { List counts = vCountMapper.selectByCol(record); if(!CollectionUtils.isEmpty(counts)){ for(V_Count count :counts){ - count.setUnfileNum(count.getOutNum() - count.getFileNum()); + Integer outNum = count.getOutNum(); + Integer fileNum = count.getFileNum(); + Integer day2Num = count.getDay2Num(); + Integer day3Num = count.getDay3Num(); + Integer day7Num = count.getDay7Num(); + java.text.NumberFormat numberformat=java.text.NumberFormat.getInstance(); + numberformat.setMaximumFractionDigits(2); + String result1=numberformat.format((float)fileNum/(float)outNum*100); + String result2=numberformat.format((float)day2Num/(float)outNum*100); + String result3=numberformat.format((float)day3Num/(float)outNum*100); + String result7=numberformat.format((float)day7Num/(float)outNum*100); + count.setFileRate(result1); + count.setDay2Rate(result2); + count.setDay3Rate(result3); + count.setDay7Rate(result7); } } return counts; diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties index 5617e73..310aef5 100644 --- a/src/main/resources/config/jdbc.properties +++ b/src/main/resources/config/jdbc.properties @@ -10,7 +10,7 @@ dataBaseIp=200.100.104.40 #\u6570\u636E\u5E93\u540D\u79F0 dataBaseName=emr_record #\u6570\u636E\u5E93\u5BC6\u7801 -dataBasePassword=AbcXyz123 +dataBasePassword=docus@702 jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver jdbc.url=jdbc\:sqlserver\://${dataBaseIp}:1433;databaseName=${dataBaseName} diff --git a/src/main/resources/mapper/V_CountMapper.xml b/src/main/resources/mapper/V_CountMapper.xml index 3ab20b4..cb3f916 100644 --- a/src/main/resources/mapper/V_CountMapper.xml +++ b/src/main/resources/mapper/V_CountMapper.xml @@ -8,6 +8,9 @@ + + + @@ -17,177 +20,54 @@ - - deptCode, deptName, inNum, outNum, fileNum, deathNum, fileRate, - day2Rate, day3Rate, day7Rate - - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp b/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp index 3dcef8b..2586100 100644 --- a/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp +++ b/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp @@ -86,10 +86,10 @@
+ maxlength="10" /> - + maxlength="10" />
diff --git a/src/main/webapp/static/js/vCount/vCountList.js b/src/main/webapp/static/js/vCount/vCountList.js index 2802ede..44ee741 100644 --- a/src/main/webapp/static/js/vCount/vCountList.js +++ b/src/main/webapp/static/js/vCount/vCountList.js @@ -7,7 +7,7 @@ $(function () { //日期控件 initDateInput('startDate', 'endDate'); //设置默认起止日期 - setDate('startDate','endDate'); + // setDate('startDate','endDate'); var url = window.location.href; var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); /* if (index != null && index != "" && index.indexOf("excel") != -1) { @@ -718,7 +718,7 @@ function initTable() { formatter: function (value, row, index) { var val; if (row.fileRate != null && row.fileRate != '') { - val = Math.round(row.fileRate * 100) + "%"; + val = row.fileRate+ "%"; } return val; } @@ -731,7 +731,7 @@ function initTable() { formatter: function (value, row, index) { var val; if (row.day2Rate != null && row.day2Rate != '') { - val = Math.round(row.day2Rate * 100) + "%"; + val = row.day2Rate+ "%"; } return val; } @@ -744,7 +744,7 @@ function initTable() { formatter: function (value, row, index) { var val; if (row.day3Rate != null && row.day3Rate != '') { - val = Math.round(row.day3Rate * 100) + "%"; + val = row.day3Rate+ "%"; } return val; } @@ -757,7 +757,7 @@ function initTable() { formatter: function (value, row, index) { var val; if (row.day7Rate != null && row.day7Rate != '') { - val = Math.round(row.day7Rate * 100) + "%"; + val = row.day7Rate+ "%"; } return val; }