From 807e22533146d9e1f13a4cf706b9fc62bb204a81 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 八月 2023 20:02:04 +0800
Subject: [PATCH] 修复bug
---
server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java | 6 +++---
server/pom.xml | 1 -
server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java | 4 +++-
server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedureProcessModel.java | 3 +--
server/src/main/resources/mappers/WorkorderRecordExtMapper.xml | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/server/pom.xml b/server/pom.xml
index f6e2f3c..82fe3dd 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -9,7 +9,6 @@
<packaging>jar</packaging>
<name>doumeemes</name>
<description></description>
-
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
diff --git a/server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedureProcessModel.java b/server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedureProcessModel.java
index 898f228..e1caf3a 100644
--- a/server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedureProcessModel.java
+++ b/server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedureProcessModel.java
@@ -23,8 +23,7 @@
private BigDecimal undoneNum;
@ApiModelProperty(value = "璁″垝鏁伴噺", example = "1")
private BigDecimal num;
- @ApiModelProperty(value = "涓嶈壇鍝佺巼%", example = "1")
- private BigDecimal unqualifiedRate;
+ @ApiModelProperty(value = "涓嶈壇鍝佺巼%", example = "1") private BigDecimal unqualifiedRate;
@ApiModelProperty(value = "鐗╂枡缂栫爜")
private String materialCode;
@ApiModelProperty(value = "宸ュ簭鍚嶇О")
diff --git a/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java b/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java
index 3f79317..cb4da76 100644
--- a/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java
+++ b/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java
@@ -26,16 +26,16 @@
private Date createTime;
@ApiModelProperty(value = "涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
- @ExcelColumn(name="涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
+// @ExcelColumn(name="涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
private Integer rootDepartId;
@ApiModelProperty(value = "宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級")
- @ExcelColumn(name="宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級")
+// @ExcelColumn(name="宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級")
@NotEmpty(message = "宸ュ巶缂栫爜涓嶈兘涓虹┖")
private Integer departId;
@ApiModelProperty(value = "宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
- @ExcelColumn(name="宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
+// @ExcelColumn(name="宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
@NotEmpty(message = "宸ュ簭缂栫爜涓嶈兘涓虹┖")
private Integer procedureId;
diff --git a/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
index 0ae9a27..451eac9 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
@@ -127,7 +127,9 @@
.add(Constants.formatBigdecimal(model.getQualifiedNum()));
model.setUndoneNum(Constants.formatBigdecimal(model.getNum()).subtract(doneNum));
//涓嶈壇鍝佺巼
-// model.set
+ if(doneNum.compareTo(new BigDecimal(0) )>0){
+ model.setUnqualifiedRate(model.getUnqualifiedNum().divide(doneNum,4).multiply(new BigDecimal(100)));
+ }
}
}
return result;
diff --git a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
index 1af2515..d1476ae 100644
--- a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
@@ -469,7 +469,7 @@
<select id="salaryStatistic" parameterType="doumeemes.dao.ext.dto.QuerySalaryStatisticDTO" resultType="doumeemes.dao.ext.vo.SalaryStatisticsListVO">
select `CREATE_USER` as userId ,sum(CASE WHEN salary_type=0 THEN salary ELSE 0 END ) as jijianSalary
,sum(CASE WHEN salary_type=0 THEN 0 ELSE salary END ) as jishiSalary
- ,count(distinct(a.workorder_id)) as num
+ ,count(distinct(workorder_id)) as num
,sum(salary) as totalSalary
from `workorder_record`
where `DELETED` =0 and `SALARY` >0
--
Gitblit v1.9.3