From 41ed93ed361163ba938749e0978b106928d805a2 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 16 八月 2023 15:46:48 +0800
Subject: [PATCH] # 工资表配置表 导出模板添加字段
---
server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java | 23 ++++++-----
server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java | 30 +++++++-------
server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java | 9 ++--
server/src/main/resources/mappers/SalaryParamMapper.xml | 8 ++-
4 files changed, 37 insertions(+), 33 deletions(-)
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 e3d3525..3f79317 100644
--- a/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java
+++ b/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java
@@ -14,14 +14,15 @@
public class SalaryParamVO {
@ApiModelProperty(value = "涓婚敭")
+ @ExcelColumn(name="搴忓彿",index = 1)
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ @ExcelColumn(name="鍒涘缓浜虹紪鐮�",index = 11)
private String createUserName;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃堕棿",index = 10, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
@@ -39,42 +40,42 @@
private Integer procedureId;
@ApiModelProperty(value = "宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
- @ExcelColumn(name="宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
+// @ExcelColumn(name="宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
@NotEmpty(message = "宸ュ簭缂栫爜涓嶈兘涓虹┖")
private Integer procedureCode;
@ApiModelProperty(value = "宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
- @ExcelColumn(name="宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
+ @ExcelColumn(name="宸ュ簭鍚嶇О",index =5)
private String procedureName;
@ApiModelProperty(value = "浜у搧鍚嶇О" )
- @Excel(name="浜у搧鍚嶇О",orderNum ="3")
+ @ExcelColumn(name="鐗╂枡鍚嶇О",index =3)
private String materialName;
@ApiModelProperty(value = "浜у搧缂栫爜" )
- @Excel(name="浜у搧缂栫爜",orderNum ="4")
+ @ExcelColumn(name="鐗╂枡缂栫爜",index =4)
private String materialCode;
@ApiModelProperty(value = "鐗╂枡缂栫爜锛堝叧鑱攎aterial_distribute琛級", example = "1")
private Integer materialId;
@ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝厓)")
- @ExcelColumn(name="宸ヨ祫鍗曚环锛堝厓)")
+ @ExcelColumn(name="宸ヨ祫鍗曚环锛堝厓)",index =6)
private BigDecimal salary;
@ApiModelProperty(value = "鏍囧噯鏁伴噺")
- @ExcelColumn(name="鏍囧噯鏁伴噺")
+ @ExcelColumn(name="鏍囧噯浜у嚭",index =7)
private Integer num;
@ApiModelProperty(value = "鏍囧噯鏃堕暱锛堢锛�")
- @ExcelColumn(name="鏍囧噯鏃堕暱锛堢锛�")
+ @ExcelColumn(name="鏍囧噯鏃堕暱锛堢锛�",index =8)
private String times;
@ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
- @ExcelColumn(name="涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
+ @ExcelColumn(name="涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�",index = 9 ,valueMapping = "0=鍚�;1=鏄�")
private Integer unqualified;
@ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂")
- @ExcelColumn(name="璁′环鏂瑰紡 0璁′欢 1璁℃椂")
+ @ExcelColumn(name="璁′环鏂瑰紡",index = 2 ,valueMapping = "0=璁′欢;1=璁℃椂")
private Integer type;
}
diff --git a/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java b/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
index 3b72cd2..b9107ac 100644
--- a/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
+++ b/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
@@ -57,7 +57,7 @@
private Integer factoryId;
@ApiModelProperty(value = "宸ュ巶鍚嶇О", example = "1")
- @ExcelColumn(name="宸ュ巶鍚嶇О",index = 4,width =15)
+ @ExcelColumn(name="宸ュ巶鍚嶇О",index = 5,width =15)
private String factoryName;
@ApiModelProperty(value = "鏉ユ簮 0浜哄伐鍒涘缓銆�1Excel瀵煎叆", example = "1")
@@ -67,12 +67,12 @@
@ExcelColumn(name="璁″垝缂栫爜",index = 0,width =15)
private String planCode;
- @ApiModelProperty(value = "璁″垝鏃ユ湡")
- @ExcelColumn(name="璁″垝鏃ユ湡",index = 3,width =15)
+ @ApiModelProperty(value = "璁″垝瀹屾垚鏃ユ湡")
+ @ExcelColumn(name="璁″垝鏃ユ湡",index = 4,width =15)
@JsonFormat(pattern = "yyyy-MM-dd")
private Date planDate;
@ApiModelProperty(value = "璁″垝寮�濮嬫棩鏈�")
- @ExcelColumn(name="璁″垝寮�濮嬫棩鏈�",index = 17,width =15)
+ @ExcelColumn(name="璁″垝寮�濮嬫棩鏈�",index = 3,width =15)
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@ApiModelProperty(value = "閿�鍞崟鍙�" )
@@ -94,26 +94,26 @@
private Integer unitId;
@ApiModelProperty(value = "鍗曚綅缂栫爜鍚嶇О", example = "1")
- @ExcelColumn(name="鍗曚綅鍚嶇О",index = 6,width =15)
+ @ExcelColumn(name="鍗曚綅鍚嶇О",index = 7,width =15)
private String unitName;
@ApiModelProperty(value = "璁″垝鏁伴噺", example = "1")
- @ExcelColumn(name="璁″垝鏁伴噺",index = 5,width =15)
+ @ExcelColumn(name="璁″垝鏁伴噺",index = 6,width =15)
private Integer num;
@ApiModelProperty(value = "鎵规鍙�")
- @ExcelColumn(name="鎵规鍙�",index = 7,width =15)
+ @ExcelColumn(name="鎵规鍙�",index = 8,width =15)
private String batch;
@ApiModelProperty(value = "鐘舵�� 1=宸茬敓鎴�;2=宸插彂甯冦��3宸插彇娑堛��4宸插垎閰嶃��5宸叉殏鍋溿��6宸插畬宸ャ��7宸插叆搴撱��8宸插叧闂�", example = "1")
- @ExcelColumn(name="璁″垝鐘舵��",valueMapping = "0=宸茬敓鎴�;1=鎵ц涓�;3=宸插彇娑�;4=宸插垎閰�;5=宸叉殏鍋�;6=宸插畬宸�;7=宸插叆搴�;8=宸插叧闂�;",index = 8,width =15)
+ @ExcelColumn(name="璁″垝鐘舵��",valueMapping = "0=宸茬敓鎴�;1=鎵ц涓�;3=宸插彇娑�;4=宸插垎閰�;5=宸叉殏鍋�;6=宸插畬宸�;7=宸插叆搴�;8=宸插叧闂�;",index = 9,width =15)
private Integer status;
@ApiModelProperty(value = "瀵煎叆鎵瑰彿锛堝叧鑱攑lan_import琛�)", example = "1")
private Integer importId;
@ApiModelProperty(value = "鏄惁鏆傚仠 0鏈殏鍋� 1宸叉殏鍋�", example = "1")
- @ExcelColumn(name="鏄惁鏆傚仠",valueMapping = "0=鍚�;1=鏄�",index = 9,width =15)
+ @ExcelColumn(name="鏄惁鏆傚仠",valueMapping = "0=鍚�;1=鏄�",index = 10,width =15)
private Integer paused;
@ApiModelProperty(value = "璁″垝鍛樼紪鐮侊紙涓巗ystem_user琛ㄥ叧鑱旓級", example = "1")
@@ -123,31 +123,31 @@
private Integer urgent;
@ApiModelProperty(value = "璁″垝鍛樺鍚�", example = "1")
- @ExcelColumn(name="璁″垝鍛樺鍚�",index = 14,width =15)
+ @ExcelColumn(name="璁″垝鍛樺鍚�",index = 15,width =15)
private String userName;
@ApiModelProperty(value = "璁″垝鍛樻墜鏈哄彿", example = "1")
- @ExcelColumn(name="璁″垝鍛樻墜鏈哄彿",index = 15,width =15)
+ @ExcelColumn(name="璁″垝鍛樻墜鏈哄彿",index = 16,width =15)
private String userMobile;
@ApiModelProperty(value = "璁″垝鍙戝竷鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
- @ExcelColumn(name="璁″垝鍙戝竷鏃堕棿",index = 13,width =15)
+ @ExcelColumn(name="璁″垝鍙戝竷鏃堕棿",index = 14,width =15)
private Date publishDate;
@ApiModelProperty(value = "鐢ㄦ埛閮ㄩ棬鍚嶇О", example = "1")
private String userDepartName;
@ApiModelProperty(value = "瀹屽伐鏁伴噺", example = "1")
- @ExcelColumn(name="瀹屽伐鏁伴噺" ,index = 10,width =15)
+ @ExcelColumn(name="瀹屽伐鏁伴噺" ,index = 11,width =15)
private Integer finishNum;
@ApiModelProperty(value = "瀹屽伐鍚堟牸鏁伴噺", example = "1")
- @ExcelColumn(name="瀹屽伐鍚堟牸鏁伴噺",index = 11,width =15)
+ @ExcelColumn(name="瀹屽伐鍚堟牸鏁伴噺",index = 12,width =15)
private Integer finishQualifiedNum;
@ApiModelProperty(value = "瀹屽伐涓嶈壇鏁伴噺", example = "1")
- @ExcelColumn(name="瀹屽伐涓嶈壇鏁伴噺",index = 12,width =15)
+ @ExcelColumn(name="瀹屽伐涓嶈壇鏁伴噺",index = 13,width =15)
private Integer finishUnQualifiedNum;
@ApiModelProperty(value = "瀛愯鍒掓槑缁嗕俊鎭�", example = "1")
diff --git a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
index 7d49fdf..d98d0ca 100644
--- a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
@@ -64,7 +64,7 @@
insert.setProcedureId(salaryParam.getProcedureId());
insert.setMaterialId(salaryParam.getMaterialId());
insert.setDeleted((byte) Constants.ZERO);
- if(findOne(insert )!=null){
+ if(findOne(insert) != null){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"鍚屼竴涓墿鏂欏湪鐩稿悓宸ュ簭涓嶈兘閲嶅閰嶇疆鍝︼紒");
}
insert.setCreateUser(principal.getId());
@@ -114,9 +114,9 @@
.set(SalaryParam::getUpdateTime,new Date())
.set(SalaryParam::getUpdateUser,principal.getId())
.set(SalaryParam::getType,salaryParam.getType())
- .set(SalaryParam::getDepartId,salaryParam.getDepartId())
- .set(SalaryParam::getMaterialId,salaryParam.getMaterialId())
- .set(SalaryParam::getProcedureId,salaryParam.getProcedureId())
+// .set(SalaryParam::getDepartId,salaryParam.getDepartId())
+// .set(SalaryParam::getMaterialId,salaryParam.getMaterialId())
+// .set(SalaryParam::getProcedureId,salaryParam.getProcedureId())
.set(SalaryParam::getSalary,salaryParam.getSalary())
.set(SalaryParam::getNum,salaryParam.getNum())
.set(SalaryParam::getTimes,salaryParam.getTimes())
@@ -142,6 +142,7 @@
@Override
public SalaryParam findOne(SalaryParam salaryParam) {
QueryWrapper<SalaryParam> wrapper = new QueryWrapper<>(salaryParam);
+ wrapper.last("limit 1");
return salaryParamMapper.selectOne(wrapper);
}
diff --git a/server/src/main/resources/mappers/SalaryParamMapper.xml b/server/src/main/resources/mappers/SalaryParamMapper.xml
index e97d95f..34d04dd 100644
--- a/server/src/main/resources/mappers/SalaryParamMapper.xml
+++ b/server/src/main/resources/mappers/SalaryParamMapper.xml
@@ -13,14 +13,16 @@
from
salary_param sp
LEFT JOIN procedures p on p.ID = sp.PROCEDURE_ID
- LEFT JOIN material m on m.ID = sp.MATERIAL_ID
+ LEFT JOIN material_distribute md on md.ID = sp.MATERIAL_ID
+ LEFT JOIN material m on m.ID = md.MATERIAL_ID
LEFT JOIN `system_user` su on su.ID = sp.CREATE_USER
where
sp.DELETED = 0
<if test="model.keyWord != null and model.keyWord != ''">
- and ( p`NAME` like concat('%',#{model.keyWord},'%')
- or p.`CODE` = #{model.keyWord})</if>
+ and ( m.`NAME` like concat('%',#{model.keyWord},'%')
+ or m.`CODE` = #{model.keyWord})</if>
<if test="model.procedureName != null and model.procedureName != ''"> and p.`NAME` like concat('%',#{model.procedureName},'%')</if>
<if test="model.type != null"> and sp.`TYPE` = #{model.type}</if>
+ order by sp.CREATE_TIME desc
</select>
</mapper>
--
Gitblit v1.9.3