From 6252abae2d37cbf7ae4e2eb6411170f440657e12 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 13 九月 2023 14:58:26 +0800
Subject: [PATCH] 111
---
server/src/main/java/doumeemes/api/system/SystemLoginLogController.java | 7 ++++++-
server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java | 8 ++++----
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 2 +-
server/src/main/resources/mappers/WorkorderRecordExtMapper.xml | 4 ++--
server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java | 4 ++--
server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExtListVO.java | 6 +++++-
6 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java b/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java
index 9ce66ab..00e7705 100644
--- a/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java
+++ b/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java
@@ -6,7 +6,10 @@
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
import doumeemes.core.utils.DateUtil;
+import doumeemes.dao.business.model.Backorder;
+import doumeemes.dao.business.vo.WorkPlansVO;
import doumeemes.dao.ext.dto.CompanyLoginDTO;
+import doumeemes.dao.ext.dto.QueryWorkPlansDTO;
import doumeemes.dao.ext.vo.CompanyLoginStatisticsVO;
import doumeemes.dao.system.dto.QuerySystemLoginLogDTO;
import doumeemes.dao.system.model.SystemLoginLog;
@@ -61,6 +64,8 @@
@ApiOperation("浼佷笟鐧诲綍缁熻瀵煎嚭")
// @RequiresPermissions("system:loginLog:query")
public void companyLoginStatisticsExport (@RequestBody PageWrap<CompanyLoginDTO> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(CompanyLoginStatisticsVO.class).exportWithFirstAndEnd(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "浼佷笟鐧诲綍缁熻_"+System.currentTimeMillis(),"浼佷笟鐧诲綍缁熻_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
+ //ExcelExporter.build(CompanyLoginStatisticsVO.class).exportWithFirstAndEnd(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "浼佷笟鐧诲綍缁熻_"+System.currentTimeMillis(),"浼佷笟鐧诲綍缁熻",null, response);
+ ExcelExporter.build(CompanyLoginStatisticsVO.class).export(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "浼佷笟鐧诲綍缁熻_"+System.currentTimeMillis(), response);
}
+
}
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java b/server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java
index 961ab91..a0363b0 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java
@@ -17,19 +17,19 @@
public class CompanyLoginStatisticsVO {
@ApiModelProperty(value = "鏃堕棿 yyyy-MM-dd")
- @ExcelColumn(name="鏃堕棿",width = 6,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="鏃堕棿",width = 6,align = HorizontalAlignment.CENTER,index = 0)
private String dataDate;
@ApiModelProperty(value = "鐧诲綍浼佷笟鍚嶇О")
- @ExcelColumn(name="鐧诲綍浼佷笟鍚嶇О",width = 6,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="鐧诲綍浼佷笟鍚嶇О",width = 8,align = HorizontalAlignment.CENTER,index = 1)
private String companyName;
@ApiModelProperty(value = "娓犻亾")
- @ExcelColumn(name="娓犻亾", valueMapping = "0=PC骞冲彴;1=閽夐拤骞冲彴;2=缇氱緤骞冲彴;3=EDGP骞冲彴;4=寰俊灏忕▼搴�",width = 6,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="娓犻亾", valueMapping = "0=PC骞冲彴;1=閽夐拤骞冲彴;2=缇氱緤骞冲彴;3=EDGP骞冲彴;4=寰俊灏忕▼搴�",width = 6,align = HorizontalAlignment.CENTER,index = 2)
private Integer orgin;
@ApiModelProperty(value = "鐧诲綍娆℃暟")
- @ExcelColumn(name="鐧诲綍娆℃暟",width = 6,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="鐧诲綍娆℃暟",width = 6,align = HorizontalAlignment.CENTER,index = 3)
private Integer loginNum;
}
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java
index 978f428..7ffc708 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java
@@ -6,6 +6,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
/**
* @author 姹熻箘韫�
@@ -86,10 +87,9 @@
private Integer salaryType;
-
@ApiModelProperty(value = "宸ヨ祫鍗曚环", example = "1")
@ExcelColumn(name="璁′环宸ヨ祫锛堝厓锛�",index =14,width =15, suffix ="鍏�")
- private Integer salaryPrice;
+ private BigDecimal salaryPrice;
@ApiModelProperty(value = "璁惧")
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExtListVO.java
index 0a1061e..1a22dad 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExtListVO.java
@@ -230,9 +230,13 @@
@ExcelColumn(name="鎶ュ伐鏃堕暱锛堢锛�")
private Integer duration;
+ @ApiModelProperty(value = "宸ヨ祫缁撴灉(鍒�)", example = "1")
+ private Integer salary;
+
@ApiModelProperty(value = "宸ヨ祫缁撴灉锛堝厓)", example = "1")
@ExcelColumn(name="宸ヨ祫缁撴灉锛堝厓)")
- private Integer salary;
+ private BigDecimal salaryYuan;
+
@ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝厓)", example = "1")
@ExcelColumn(name="宸ヨ祫鍗曚环锛堝厓)")
private Integer salaryPrice;
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
index 09bf3d7..ed3ee89 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -1766,7 +1766,7 @@
wreev.setDuration("-");
}
wreev.setSalaryType(re.getSalaryType());
- wreev.setSalaryPrice(re.getSalary());
+ wreev.setSalaryPrice(re.getSalaryYuan());
list.add(wreev);
}
diff --git a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
index c90d22e..86cb369 100644
--- a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
@@ -549,8 +549,8 @@
</select>
<select id="selectListNew" parameterType="doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO" resultMap="WorkorderRecordExtListVO">
SELECT
- `a`.*,
- `dmodel`.`ID` AS DMODEL_ID,
+ `a`.*, ROUND(a.SALARY / 100 ,2) as salaryYuan,
+ `dmodel`.`ID` AS DMODEL_ID,
`dmodel`.`DELETED` AS DMODEL_DELETED,
`dmodel`.`CREATE_USER` AS DMODEL_CREATE_USER,
`dmodel`.`CREATE_TIME` AS DMODEL_CREATE_TIME,
--
Gitblit v1.9.3