From 513485caca0c56c713797bfd208c6f22c7ce7727 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 17 八月 2023 17:06:54 +0800
Subject: [PATCH] 初始化1.0.1
---
server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java | 110 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 63 insertions(+), 47 deletions(-)
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 566d872..c36de3a 100644
--- a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
@@ -1,24 +1,19 @@
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;
/**
@@ -34,25 +29,7 @@
@Override
public Integer create(SalaryParam 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);
+ salaryParamMapper.insert(salaryParam);
return salaryParam.getId();
}
@@ -81,25 +58,6 @@
}
@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;
@@ -125,12 +83,70 @@
QueryWrapper<SalaryParam> wrapper = new QueryWrapper<>(salaryParam);
return salaryParamMapper.selectList(wrapper);
}
-
+
@Override
- public PageData<SalaryParam> findPage(PageWrap<SalaryParamDTO> pageWrap) {
+ public PageData<SalaryParam> findPage(PageWrap<SalaryParam> pageWrap) {
IPage<SalaryParam> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- SalaryParamDTO model = pageWrap.getModel();
- return PageData.from(salaryParamMapper.selectPage(page, model));
+ 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));
}
@Override
--
Gitblit v1.9.3