DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

三期内容优化

Browse Source
This commit is contained in:
hdka
2025-03-19 21:37:54 +08:00
parent aa64312441
commit ed7012e2dd
24 changed files with 671 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java Normal file
View File

@@ -0,0 +1,49 @@
package com.ruoyi.oa.service;
import com.ruoyi.oa.domain.SysOaWarehouseMaster;
import com.ruoyi.oa.domain.vo.SysOaWarehouseMasterVo;
import com.ruoyi.oa.domain.bo.SysOaWarehouseMasterBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 出库单管理Service接口
*
* @author hdak
* @date 2025-03-19
*/
public interface ISysOaWarehouseMasterService {
/**
* 查询出库单管理
*/
SysOaWarehouseMasterVo queryById(Long masterId);
/**
* 查询出库单管理列表
*/
TableDataInfo<SysOaWarehouseMasterVo> queryPageList(SysOaWarehouseMasterBo bo, PageQuery pageQuery);
/**
* 查询出库单管理列表
*/
List<SysOaWarehouseMasterVo> queryList(SysOaWarehouseMasterBo bo);
/**
* 新增出库单管理
*/
Boolean insertByBo(SysOaWarehouseMasterBo bo);
/**
* 修改出库单管理
*/
Boolean updateByBo(SysOaWarehouseMasterBo bo);
/**
* 校验并批量删除出库单管理信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

25
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaCustomerServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.ruoyi.oa.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -45,7 +46,7 @@ public class OaCustomerServiceImpl implements IOaCustomerService {
*/
@Override
public TableDataInfo<OaCustomerVo> queryPageList(OaCustomerBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OaCustomer> lqw = buildQueryWrapper(bo);
QueryWrapper<OaCustomer> lqw = buildQueryWrapper(bo);
Page<OaCustomerVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@@ -55,20 +56,18 @@ public class OaCustomerServiceImpl implements IOaCustomerService {
*/
@Override
public List<OaCustomerVo> queryList(OaCustomerBo bo) {
LambdaQueryWrapper<OaCustomer> lqw = buildQueryWrapper(bo);
QueryWrapper<OaCustomer> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<OaCustomer> buildQueryWrapper(OaCustomerBo bo) {
private QueryWrapper<OaCustomer> buildQueryWrapper(OaCustomerBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<OaCustomer> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getName()), OaCustomer::getName, bo.getName());
lqw.eq(bo.getFollowUpStatus() != null, OaCustomer::getFollowUpStatus, bo.getFollowUpStatus());
lqw.eq(bo.getContactLastTime() != null, OaCustomer::getContactLastTime, bo.getContactLastTime());
lqw.eq(StringUtils.isNotBlank(bo.getContactLastContent()), OaCustomer::getContactLastContent, bo.getContactLastContent());
lqw.eq(bo.getContactNextTime() != null, OaCustomer::getContactNextTime, bo.getContactNextTime());
lqw.eq(bo.getDealStatus() != null, OaCustomer::getDealStatus, bo.getDealStatus());
lqw.eq(bo.getAreaId() != null, OaCustomer::getAreaId, bo.getAreaId());
QueryWrapper<OaCustomer> lqw = Wrappers.query();
lqw.like(StringUtils.isNotBlank(bo.getName()), "oc.name", bo.getName());
lqw.eq(bo.getAreaId() != null, "oc.area_id", bo.getAreaId());
lqw.eq(bo.getIndustryId() != null, "oc.industry_id", bo.getAreaId());
lqw.eq(bo.getLevel() != null, "oc.level", bo.getAreaId());
lqw.eq("oc.del_flag", 0L);
return lqw;
}
@@ -116,14 +115,14 @@ public class OaCustomerServiceImpl implements IOaCustomerService {
@Override
public TableDataInfo<OaCustomerVo> queryPageListToUser(OaCustomerBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OaCustomer> lqw = buildQueryWrapper(bo);
QueryWrapper<OaCustomer> lqw = buildQueryWrapper(bo);
Page<OaCustomerVo> result = baseMapper.selectVoPageToUser(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@Override
public TableDataInfo<OaCustomerVo> queryPageListToSea(OaCustomerBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OaCustomer> lqw = buildQueryWrapper(bo);
QueryWrapper<OaCustomer> lqw = buildQueryWrapper(bo);
Page<OaCustomerVo> result = baseMapper.selectVoPageToUser(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}

5
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaSalaryServiceImpl.java
View File

@@ -118,7 +118,7 @@ public class OaSalaryServiceImpl implements IOaSalaryService {
// 写入真实薪资 为日薪乘以工作日-罚金
for (OaSalaryVo record : result.getRecords()) {
record.setRealSalary(record.getBaseSalary()+record.getPunishSalary());
record.setRealSalary(record.getBaseSalary()+record.getPunishSalary()-record.getInsure());
}
return TableDataInfo.build(result);
}
@@ -141,7 +141,7 @@ public class OaSalaryServiceImpl implements IOaSalaryService {
// 写入真实薪资 为日薪乘以工作日-罚金
for (OaSalaryVo record : result.getRecords()) {
record.setRealSalary(record.getBaseSalary()*dayNum+record.getPunishSalary());
record.setRealSalary(record.getBaseSalary()*dayNum+record.getPunishSalary()-record.getInsure());
}
return TableDataInfo.build(result);
}
@@ -154,6 +154,7 @@ public class OaSalaryServiceImpl implements IOaSalaryService {
if(Objects.nonNull(user)){
OaSalary oaSalary = new OaSalary();
oaSalary.setUserId(user.getUserId());
oaSalary.setInsure(user.getInsure());
oaSalary.setBaseSalary(Double.valueOf(user.getLaborCost()));
oaSalary.setPayTime(payTime);
baseMapper.insert(oaSalary);

112
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java Normal file
View File

@@ -0,0 +1,112 @@
package com.ruoyi.oa.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.ruoyi.oa.domain.bo.SysOaWarehouseMasterBo;
import com.ruoyi.oa.domain.vo.SysOaWarehouseMasterVo;
import com.ruoyi.oa.domain.SysOaWarehouseMaster;
import com.ruoyi.oa.mapper.SysOaWarehouseMasterMapper;
import com.ruoyi.oa.service.ISysOaWarehouseMasterService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 出库单管理Service业务层处理
*
* @author hdak
* @date 2025-03-19
*/
@RequiredArgsConstructor
@Service
public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterService {
private final SysOaWarehouseMasterMapper baseMapper;
/**
* 查询出库单管理
*/
@Override
public SysOaWarehouseMasterVo queryById(Long masterId){
return baseMapper.selectVoById(masterId);
}
/**
* 查询出库单管理列表
*/
@Override
public TableDataInfo<SysOaWarehouseMasterVo> queryPageList(SysOaWarehouseMasterBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SysOaWarehouseMaster> lqw = buildQueryWrapper(bo);
Page<SysOaWarehouseMasterVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询出库单管理列表
*/
@Override
public List<SysOaWarehouseMasterVo> queryList(SysOaWarehouseMasterBo bo) {
LambdaQueryWrapper<SysOaWarehouseMaster> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<SysOaWarehouseMaster> buildQueryWrapper(SysOaWarehouseMasterBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SysOaWarehouseMaster> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getType() != null, SysOaWarehouseMaster::getType, bo.getType());
lqw.eq(bo.getProjectId() != null, SysOaWarehouseMaster::getProjectId, bo.getProjectId());
lqw.eq(bo.getSignTime() != null, SysOaWarehouseMaster::getSignTime, bo.getSignTime());
lqw.eq(StringUtils.isNotBlank(bo.getSignUser()), SysOaWarehouseMaster::getSignUser, bo.getSignUser());
return lqw;
}
/**
* 新增出库单管理
*/
@Override
public Boolean insertByBo(SysOaWarehouseMasterBo bo) {
SysOaWarehouseMaster add = BeanUtil.toBean(bo, SysOaWarehouseMaster.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setMasterId(add.getMasterId());
}
return flag;
}
/**
* 修改出库单管理
*/
@Override
public Boolean updateByBo(SysOaWarehouseMasterBo bo) {
SysOaWarehouseMaster update = BeanUtil.toBean(bo, SysOaWarehouseMaster.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(SysOaWarehouseMaster entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除出库单管理
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}