From b6c8cfb873fdb34e2a78acf8ce189f77d50c4be9 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 14 八月 2023 15:16:06 +0800
Subject: [PATCH] # 工资表配置表
---
server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java | 71 +++++++++++
server/src/main/java/doumeemes/dao/business/SalaryParamMapper.java | 5
server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java | 110 +++++++----------
server/src/main/java/doumeemes/service/business/SalaryParamService.java | 16 ++
server/src/main/resources/mappers/SalaryParamMapper.xml | 23 +++
server/src/main/java/doumeemes/api/business/SalaryParamController.java | 9
server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java | 7
server/src/main/java/doumeemes/dao/ext/dto/SalaryParamDTO.java | 24 ++++
server/src/main/java/doumeemes/dao/business/model/SalaryParam.java | 37 +++--
9 files changed, 213 insertions(+), 89 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/business/SalaryParamController.java b/server/src/main/java/doumeemes/api/business/SalaryParamController.java
index db825bd..899774b 100644
--- a/server/src/main/java/doumeemes/api/business/SalaryParamController.java
+++ b/server/src/main/java/doumeemes/api/business/SalaryParamController.java
@@ -7,10 +7,11 @@
import doumeemes.core.model.PageWrap;
import doumeemes.core.model.PageData;
import doumeemes.dao.business.model.SalaryParam;
+import doumeemes.dao.ext.dto.SalaryParamDTO;
import doumeemes.service.business.SalaryParamService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -33,7 +34,7 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
- @RequiresPermissions("business:salaryparam:create")
+// @RequiresPermissions("business:salaryparam:create")
public ApiResponse create(@RequestBody SalaryParam salaryParam) {
return ApiResponse.success(salaryParamService.create(salaryParam));
}
@@ -70,14 +71,14 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:salaryparam:query")
- public ApiResponse<PageData<SalaryParam>> findPage (@RequestBody PageWrap<SalaryParam> pageWrap) {
+ public ApiResponse<PageData<SalaryParam>> findPage (@RequestBody PageWrap<SalaryParamDTO> pageWrap) {
return ApiResponse.success(salaryParamService.findPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:salaryparam:exportExcel")
- public void exportExcel (@RequestBody PageWrap<SalaryParam> pageWrap, HttpServletResponse response) {
+ public void exportExcel (@RequestBody PageWrap<SalaryParamDTO> pageWrap, HttpServletResponse response) {
ExcelExporter.build(SalaryParam.class).export(salaryParamService.findPage(pageWrap).getRecords(), "璁剧疆绫�-缁╂晥宸ヨ祫閰嶇疆琛�", response);
}
diff --git a/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java b/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java
index dbd285c..5ed0cef 100644
--- a/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java
@@ -7,6 +7,7 @@
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
import doumeemes.dao.business.model.SalaryParam;
+import doumeemes.dao.ext.dto.SalaryParamDTO;
import doumeemes.service.business.SalaryParamService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -33,7 +34,7 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
- @RequiresPermissions("business:salaryparam:create")
+// @RequiresPermissions("business:salaryparam:create")
public ApiResponse create(@RequestBody SalaryParam salaryParam) {
return ApiResponse.success(salaryParamService.create(salaryParam));
}
@@ -70,14 +71,14 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:salaryparam:query")
- public ApiResponse<PageData<SalaryParam>> findPage (@RequestBody PageWrap<SalaryParam> pageWrap) {
+ public ApiResponse<PageData<SalaryParam>> findPage (@RequestBody PageWrap<SalaryParamDTO> pageWrap) {
return ApiResponse.success(salaryParamService.findPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:salaryparam:exportExcel")
- public void exportExcel (@RequestBody PageWrap<SalaryParam> pageWrap, HttpServletResponse response) {
+ public void exportExcel (@RequestBody PageWrap<SalaryParamDTO> pageWrap, HttpServletResponse response) {
ExcelExporter.build(SalaryParam.class).export(salaryParamService.findPage(pageWrap).getRecords(), "璁剧疆绫�-缁╂晥宸ヨ祫閰嶇疆琛�", response);
}
diff --git a/server/src/main/java/doumeemes/dao/business/SalaryParamMapper.java b/server/src/main/java/doumeemes/dao/business/SalaryParamMapper.java
index 846be1b..42902e8 100644
--- a/server/src/main/java/doumeemes/dao/business/SalaryParamMapper.java
+++ b/server/src/main/java/doumeemes/dao/business/SalaryParamMapper.java
@@ -1,7 +1,9 @@
package doumeemes.dao.business;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import doumeemes.dao.business.model.SalaryParam;
+import doumeemes.dao.ext.dto.SalaryParamDTO;
/**
* @author 姹熻箘韫�
@@ -9,4 +11,7 @@
*/
public interface SalaryParamMapper extends BaseMapper<SalaryParam> {
+
+ IPage<SalaryParam> selectPage(IPage<SalaryParam> page, SalaryParamDTO model);
+
}
diff --git a/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java b/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java
index e686ebc..1a79df2 100644
--- a/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java
+++ b/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java
@@ -8,6 +8,9 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import javax.validation.constraints.NotEmpty;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -20,57 +23,59 @@
@TableName("`salary_param`")
public class SalaryParam {
- @ApiModelProperty(value = "涓婚敭", example = "1")
+ @ApiModelProperty(value = "涓婚敭")
@ExcelColumn(name="涓婚敭")
+ @TableId(value = "id",type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
+ @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
@ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
private Byte deleted;
- @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer createUser;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
- @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer updateUser;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime;
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�", example = "1")
+ @ApiModelProperty(value = "涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
@ExcelColumn(name="涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
private Integer rootDepartId;
- @ApiModelProperty(value = "宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級", example = "1")
+ @ApiModelProperty(value = "宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級")
@ExcelColumn(name="宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級")
+ @NotEmpty(message = "宸ュ巶缂栫爜涓嶈兘涓虹┖")
private Integer departId;
- @ApiModelProperty(value = "宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級", example = "1")
+ @ApiModelProperty(value = "宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
@ExcelColumn(name="宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
+ @NotEmpty(message = "宸ュ簭缂栫爜涓嶈兘涓虹┖")
private Integer procedureId;
- @ApiModelProperty(value = "bom缂栫爜锛堝叧鑱攂om琛級", example = "1")
+ @ApiModelProperty(value = "bom缂栫爜锛堝叧鑱攂om琛級")
@ExcelColumn(name="bom缂栫爜锛堝叧鑱攂om琛級")
- private Integer bomId;
+ @NotEmpty(message = "鐗╂枡缂栫爜涓嶈兘涓虹┖")
+ private Integer materialId;
- @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝厓)", example = "1")
+ @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝厓)")
@ExcelColumn(name="宸ヨ祫鍗曚环锛堝厓)")
- private Integer salary;
+ private BigDecimal salary;
- @ApiModelProperty(value = "鏍囧噯鏁伴噺", example = "1")
+ @ApiModelProperty(value = "鏍囧噯鏁伴噺")
@ExcelColumn(name="鏍囧噯鏁伴噺")
private Integer num;
@@ -78,11 +83,11 @@
@ExcelColumn(name="鏍囧噯鏃堕暱锛堢锛�")
private String times;
- @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�", example = "1")
+ @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
@ExcelColumn(name="涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
private Integer unqualified;
- @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂", example = "1")
+ @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂")
@ExcelColumn(name="璁′环鏂瑰紡 0璁′欢 1璁℃椂")
private Integer type;
diff --git a/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java b/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java
new file mode 100644
index 0000000..7d01beb
--- /dev/null
+++ b/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java
@@ -0,0 +1,71 @@
+package doumeemes.dao.business.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import doumeemes.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import javax.validation.constraints.NotEmpty;
+import java.math.BigDecimal;
+
+@Data
+@ApiModel("")
+public class SalaryParamVO {
+
+ @ApiModelProperty(value = "涓婚敭")
+ private Integer id;
+
+ @ApiModelProperty(value = "涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
+ @ExcelColumn(name="涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
+ private Integer rootDepartId;
+
+ @ApiModelProperty(value = "宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級")
+ @ExcelColumn(name="宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級")
+ @NotEmpty(message = "宸ュ巶缂栫爜涓嶈兘涓虹┖")
+ private Integer departId;
+
+ @ApiModelProperty(value = "宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
+ @ExcelColumn(name="宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
+ @NotEmpty(message = "宸ュ簭缂栫爜涓嶈兘涓虹┖")
+ private Integer procedureId;
+
+ @ApiModelProperty(value = "宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
+ @ExcelColumn(name="宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
+ @NotEmpty(message = "宸ュ簭缂栫爜涓嶈兘涓虹┖")
+ private Integer procedureCode;
+
+ @ApiModelProperty(value = "宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
+ @ExcelColumn(name="宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
+ private String procedureName;
+
+ @ApiModelProperty(value = "浜у搧鍚嶇О" )
+ @Excel(name="浜у搧鍚嶇О",orderNum ="3")
+ private String materialName;
+
+ @ApiModelProperty(value = "浜у搧缂栫爜" )
+ @Excel(name="浜у搧缂栫爜",orderNum ="4")
+ private String materialCode;
+
+ @ApiModelProperty(value = "鐗╂枡缂栫爜锛堝叧鑱攎aterial_distribute琛級", example = "1")
+ private Integer materialId;
+
+ @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝厓)")
+ @ExcelColumn(name="宸ヨ祫鍗曚环锛堝厓)")
+ private BigDecimal salary;
+
+ @ApiModelProperty(value = "鏍囧噯鏁伴噺")
+ @ExcelColumn(name="鏍囧噯鏁伴噺")
+ private Integer num;
+
+ @ApiModelProperty(value = "鏍囧噯鏃堕暱锛堢锛�")
+ @ExcelColumn(name="鏍囧噯鏃堕暱锛堢锛�")
+ private String times;
+
+ @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
+ @ExcelColumn(name="涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
+ private Integer unqualified;
+
+ @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂")
+ @ExcelColumn(name="璁′环鏂瑰紡 0璁′欢 1璁℃椂")
+ private Integer type;
+}
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/SalaryParamDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/SalaryParamDTO.java
new file mode 100644
index 0000000..bfe6fa0
--- /dev/null
+++ b/server/src/main/java/doumeemes/dao/ext/dto/SalaryParamDTO.java
@@ -0,0 +1,24 @@
+package doumeemes.dao.ext.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2022/04/20 10:56
+ */
+@Data
+@ApiModel("缁╂晥宸ヨ祫閰嶇疆")
+public class SalaryParamDTO {
+
+ @ApiModelProperty(value = "鐗╂枡鍚嶇О鎴栫紪鐮�")
+ private String keyWord;
+
+ @ApiModelProperty(value = "宸ュ簭鍚嶇О")
+ private String procedureName;
+
+ @ApiModelProperty(value = "璁′环鏂瑰紡")
+ private String type;
+
+}
diff --git a/server/src/main/java/doumeemes/service/business/SalaryParamService.java b/server/src/main/java/doumeemes/service/business/SalaryParamService.java
index 1e89246..f58f513 100644
--- a/server/src/main/java/doumeemes/service/business/SalaryParamService.java
+++ b/server/src/main/java/doumeemes/service/business/SalaryParamService.java
@@ -3,6 +3,8 @@
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
import doumeemes.dao.business.model.SalaryParam;
+import doumeemes.dao.ext.dto.SalaryParamDTO;
+
import java.util.List;
/**
@@ -14,7 +16,7 @@
/**
* 鍒涘缓
- *
+ *
* @param salaryParam 瀹炰綋瀵硅薄
* @return Integer
*/
@@ -48,6 +50,14 @@
*/
void updateById(SalaryParam salaryParam);
+
+ /**
+ * 涓婚敭鏇存柊
+ *
+ * @param salaryParam 瀹炰綋瀵硅薄
+ */
+ void update(SalaryParam salaryParam);
+
/**
* 鎵归噺涓婚敭鏇存柊
*
@@ -78,14 +88,14 @@
* @return List<SalaryParam>
*/
List<SalaryParam> findList(SalaryParam salaryParam);
-
+
/**
* 鍒嗛〉鏌ヨ
*
* @param pageWrap 鍒嗛〉瀵硅薄
* @return PageData<SalaryParam>
*/
- PageData<SalaryParam> findPage(PageWrap<SalaryParam> pageWrap);
+ PageData<SalaryParam> findPage(PageWrap<SalaryParamDTO> pageWrap);
/**
* 鏉′欢缁熻
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 c36de3a..566d872 100644
--- a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
@@ -1,19 +1,24 @@
package doumeemes.service.business.impl;
+import doumeemes.core.model.LoginUserInfo;
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
+import doumeemes.core.utils.Constants;
import doumeemes.core.utils.Utils;
import doumeemes.dao.business.SalaryParamMapper;
import doumeemes.dao.business.model.SalaryParam;
+import doumeemes.dao.ext.dto.SalaryParamDTO;
import doumeemes.service.business.SalaryParamService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
/**
@@ -29,7 +34,25 @@
@Override
public Integer create(SalaryParam salaryParam) {
- salaryParamMapper.insert(salaryParam);
+ LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
+ SalaryParam insert = new SalaryParam();
+ insert.setDeleted((byte) Constants.ZERO);
+ insert.setCreateUser(principal.getId());
+ insert.setCreateTime(new Date());
+ insert.setUpdateUser(principal.getId());
+ insert.setUpdateTime(new Date());
+ insert.setRemark(salaryParam.getRemark());
+ insert.setRootDepartId(salaryParam.getRootDepartId());
+ insert.setDepartId(salaryParam.getDepartId());
+ insert.setProcedureId(salaryParam.getProcedureId());
+ insert.setMaterialId(salaryParam.getMaterialId());
+ insert.setSalary(salaryParam.getSalary());
+ insert.setNum(salaryParam.getNum());
+ insert.setTimes(salaryParam.getTimes());
+ insert.setUnqualified(salaryParam.getUnqualified());
+ insert.setType(salaryParam.getType());
+ salaryParamMapper.insert(insert);
return salaryParam.getId();
}
@@ -58,6 +81,25 @@
}
@Override
+ public void update(SalaryParam salaryParam) {
+ LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ UpdateWrapper<SalaryParam> wrapper = new UpdateWrapper<>();
+ wrapper.lambda()
+ .eq(SalaryParam::getId,salaryParam.getId())
+ .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::getSalary,salaryParam.getSalary())
+ .set(SalaryParam::getNum,salaryParam.getNum())
+ .set(SalaryParam::getTimes,salaryParam.getTimes())
+ .set(SalaryParam::getUnqualified,salaryParam.getUnqualified());
+ salaryParamMapper.update(null,wrapper);
+ }
+
+ @Override
public void updateByIdInBatch(List<SalaryParam> salaryParams) {
if (CollectionUtils.isEmpty(salaryParams)) {
return;
@@ -83,70 +125,12 @@
QueryWrapper<SalaryParam> wrapper = new QueryWrapper<>(salaryParam);
return salaryParamMapper.selectList(wrapper);
}
-
+
@Override
- public PageData<SalaryParam> findPage(PageWrap<SalaryParam> pageWrap) {
+ public PageData<SalaryParam> findPage(PageWrap<SalaryParamDTO> pageWrap) {
IPage<SalaryParam> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<SalaryParam> queryWrapper = new QueryWrapper<>();
- Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(SalaryParam::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getDeleted() != null) {
- queryWrapper.lambda().eq(SalaryParam::getDeleted, pageWrap.getModel().getDeleted());
- }
- if (pageWrap.getModel().getCreateUser() != null) {
- queryWrapper.lambda().eq(SalaryParam::getCreateUser, pageWrap.getModel().getCreateUser());
- }
- if (pageWrap.getModel().getCreateTime() != null) {
- queryWrapper.lambda().ge(SalaryParam::getCreateTime, Utils.Date.getStart(pageWrap.getModel().getCreateTime()));
- queryWrapper.lambda().le(SalaryParam::getCreateTime, Utils.Date.getEnd(pageWrap.getModel().getCreateTime()));
- }
- if (pageWrap.getModel().getUpdateUser() != null) {
- queryWrapper.lambda().eq(SalaryParam::getUpdateUser, pageWrap.getModel().getUpdateUser());
- }
- if (pageWrap.getModel().getUpdateTime() != null) {
- queryWrapper.lambda().ge(SalaryParam::getUpdateTime, Utils.Date.getStart(pageWrap.getModel().getUpdateTime()));
- queryWrapper.lambda().le(SalaryParam::getUpdateTime, Utils.Date.getEnd(pageWrap.getModel().getUpdateTime()));
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(SalaryParam::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getRootDepartId() != null) {
- queryWrapper.lambda().eq(SalaryParam::getRootDepartId, pageWrap.getModel().getRootDepartId());
- }
- if (pageWrap.getModel().getDepartId() != null) {
- queryWrapper.lambda().eq(SalaryParam::getDepartId, pageWrap.getModel().getDepartId());
- }
- if (pageWrap.getModel().getProcedureId() != null) {
- queryWrapper.lambda().eq(SalaryParam::getProcedureId, pageWrap.getModel().getProcedureId());
- }
- if (pageWrap.getModel().getBomId() != null) {
- queryWrapper.lambda().eq(SalaryParam::getBomId, pageWrap.getModel().getBomId());
- }
- if (pageWrap.getModel().getSalary() != null) {
- queryWrapper.lambda().eq(SalaryParam::getSalary, pageWrap.getModel().getSalary());
- }
- if (pageWrap.getModel().getNum() != null) {
- queryWrapper.lambda().eq(SalaryParam::getNum, pageWrap.getModel().getNum());
- }
- if (pageWrap.getModel().getTimes() != null) {
- queryWrapper.lambda().eq(SalaryParam::getTimes, pageWrap.getModel().getTimes());
- }
- if (pageWrap.getModel().getUnqualified() != null) {
- queryWrapper.lambda().eq(SalaryParam::getUnqualified, pageWrap.getModel().getUnqualified());
- }
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(SalaryParam::getType, pageWrap.getModel().getType());
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(salaryParamMapper.selectPage(page, queryWrapper));
+ SalaryParamDTO model = pageWrap.getModel();
+ return PageData.from(salaryParamMapper.selectPage(page, model));
}
@Override
diff --git a/server/src/main/resources/mappers/SalaryParamMapper.xml b/server/src/main/resources/mappers/SalaryParamMapper.xml
new file mode 100644
index 0000000..a91bf95
--- /dev/null
+++ b/server/src/main/resources/mappers/SalaryParamMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="doumeemes.dao.business.SalaryParamMapper">
+
+
+ <select id="selectPage" resultType="doumeemes.dao.business.model.SalaryParam">
+ SELECT
+ sp.*,
+ m.`NAME` as materialName,
+ p.`NAME` as proceduresName
+ from
+ salary_param sp
+ LEFT JOIN procedures p on p.ID = sp.PROCEDURE_ID
+ LEFT JOIN material m on m.ID = bom.MATERIAL_ID
+ <where>
+ <if test="keyWord != null and keyWord != ''">
+ p`NAME` like concat('%',#{keyWord},'%')
+ or p.`CODE` = #{keyWord}</if>
+ <if test="procedureName != null and procedureName = ''"> and p.`NAME` like concat('%',#{procedureName},'%')</if>
+ <if test="type != null"> and sp.`TYPE` = #{type}</if>
+ </where>
+ </select>
+</mapper>
--
Gitblit v1.9.3