feat(oa): 添加物流预览和快递问题以及报工相关功能
- 新增物流预览(OaExpress)相关实体、控制器、服务和映射 - 新增快递问题(OaExpressQuestion)相关实体、控制器、服务和映射 - 实现物流预览和快递问题的增删查改功能 - 添加物流预览的及时更新功能- 新增问题反馈(OaFeedback)和服务接口 - 新增项目报工(OaReport)和服务接口 - 添加百世快递路由查询工具类
This commit is contained in:
@@ -0,0 +1,48 @@
|
||||
package com.gear.oa.service;
|
||||
|
||||
import com.gear.common.core.domain.PageQuery;
|
||||
import com.gear.common.core.page.TableDataInfo;
|
||||
import com.gear.oa.domain.bo.OaExpressQuestionBo;
|
||||
import com.gear.oa.domain.vo.OaExpressQuestionVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 快递问题Service接口
|
||||
*
|
||||
* @author hdka
|
||||
* @date 2025-07-21
|
||||
*/
|
||||
public interface IOaExpressQuestionService {
|
||||
|
||||
/**
|
||||
* 查询快递问题
|
||||
*/
|
||||
OaExpressQuestionVo queryById(Long questionId);
|
||||
|
||||
/**
|
||||
* 查询快递问题列表
|
||||
*/
|
||||
TableDataInfo<OaExpressQuestionVo> queryPageList(OaExpressQuestionBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询快递问题列表
|
||||
*/
|
||||
List<OaExpressQuestionVo> queryList(OaExpressQuestionBo bo);
|
||||
|
||||
/**
|
||||
* 新增快递问题
|
||||
*/
|
||||
Boolean insertByBo(OaExpressQuestionBo bo);
|
||||
|
||||
/**
|
||||
* 修改快递问题
|
||||
*/
|
||||
Boolean updateByBo(OaExpressQuestionBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除快递问题信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
package com.gear.oa.service;
|
||||
|
||||
import com.gear.common.core.domain.PageQuery;
|
||||
import com.gear.common.core.page.TableDataInfo;
|
||||
import com.gear.oa.domain.bo.OaExpressBo;
|
||||
import com.gear.oa.domain.vo.OaExpressVo;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 物流预览Service接口
|
||||
*
|
||||
* @author hdka
|
||||
* @date 2025-07-20
|
||||
*/
|
||||
public interface IOaExpressService {
|
||||
|
||||
/**
|
||||
* 查询物流预览
|
||||
*/
|
||||
OaExpressVo queryById(Long expressId);
|
||||
|
||||
/**
|
||||
* 查询物流预览列表
|
||||
*/
|
||||
TableDataInfo<OaExpressVo> queryPageList(OaExpressBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询物流预览列表
|
||||
*/
|
||||
List<OaExpressVo> queryList(OaExpressBo bo);
|
||||
|
||||
/**
|
||||
* 新增物流预览
|
||||
*/
|
||||
Boolean insertByBo(OaExpressBo bo);
|
||||
|
||||
/**
|
||||
* 修改物流预览
|
||||
*/
|
||||
Boolean updateByBo(OaExpressBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除物流预览信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
|
||||
/**
|
||||
* 及时更新选中的状态
|
||||
* @param list
|
||||
* @return
|
||||
*/
|
||||
Boolean getRefreshExpress(List<Long> list) throws IOException;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
package com.gear.oa.service;
|
||||
|
||||
import com.gear.common.core.domain.PageQuery;
|
||||
import com.gear.common.core.page.TableDataInfo;
|
||||
import com.gear.oa.domain.bo.OaFeedbackBo;
|
||||
import com.gear.oa.domain.vo.OaFeedbackVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 问题反馈Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-28
|
||||
*/
|
||||
public interface IOaFeedbackService {
|
||||
|
||||
/**
|
||||
* 查询问题反馈
|
||||
*/
|
||||
OaFeedbackVo queryById(Long feedbackId);
|
||||
|
||||
/**
|
||||
* 查询问题反馈列表
|
||||
*/
|
||||
TableDataInfo<OaFeedbackVo> queryPageList(OaFeedbackBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询问题反馈列表
|
||||
*/
|
||||
List<OaFeedbackVo> queryList(OaFeedbackBo bo);
|
||||
|
||||
/**
|
||||
* 新增问题反馈
|
||||
*/
|
||||
Boolean insertByBo(OaFeedbackBo bo);
|
||||
|
||||
/**
|
||||
* 修改问题反馈
|
||||
*/
|
||||
Boolean updateByBo(OaFeedbackBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除问题反馈信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
|
||||
Boolean updateToRead(OaFeedbackBo bo);
|
||||
|
||||
int delItem(Long feedbackId);
|
||||
|
||||
TableDataInfo<OaFeedbackVo> indexQueryList(OaFeedbackBo bo, PageQuery pageQuery);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
package com.gear.oa.service;
|
||||
|
||||
import com.gear.common.core.domain.PageQuery;
|
||||
import com.gear.common.core.page.TableDataInfo;
|
||||
import com.gear.oa.domain.bo.OaReportBo;
|
||||
import com.gear.oa.domain.vo.OaReportVo;
|
||||
import com.gear.oa.domain.vo.ReportCardVo;
|
||||
import com.gear.oa.domain.vo.ReportPieVo;
|
||||
import com.gear.oa.domain.vo.ReportTrendVo;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 项目报工Service接口
|
||||
*
|
||||
* @author hdka
|
||||
* @date 2025-06-16
|
||||
*/
|
||||
public interface IOaReportService {
|
||||
|
||||
/**
|
||||
* 查询项目报工
|
||||
*/
|
||||
OaReportVo queryById(Long reportId);
|
||||
|
||||
/**
|
||||
* 查询项目报工列表
|
||||
*/
|
||||
TableDataInfo<OaReportVo> queryPageList(OaReportBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询项目报工列表
|
||||
*/
|
||||
List<OaReportVo> queryList(OaReportBo bo);
|
||||
|
||||
/**
|
||||
* 新增项目报工
|
||||
*/
|
||||
Boolean insertByBo(OaReportBo bo);
|
||||
|
||||
/**
|
||||
* 修改项目报工
|
||||
*/
|
||||
Boolean updateByBo(OaReportBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除项目报工信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
|
||||
/**
|
||||
* 报工数据看板
|
||||
* @return
|
||||
*/
|
||||
ReportCardVo getCardData();
|
||||
|
||||
public List<ReportTrendVo> getTrend(LocalDate start, LocalDate end);
|
||||
|
||||
public List<ReportPieVo> getDistribution(LocalDate start, LocalDate end);
|
||||
|
||||
|
||||
List<OaReportVo> getRankData(LocalDate start, LocalDate end);
|
||||
|
||||
List<OaReportVo> getProjects(LocalDate start, LocalDate end);
|
||||
|
||||
List<OaReportVo> clearList(LocalDate start, LocalDate end);
|
||||
|
||||
List<OaReportVo> getSummaryData(LocalDate start, LocalDate end);
|
||||
}
|
||||
@@ -0,0 +1,150 @@
|
||||
package com.gear.oa.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.gear.common.core.domain.PageQuery;
|
||||
import com.gear.common.core.page.TableDataInfo;
|
||||
import com.gear.common.helper.LoginHelper;
|
||||
import com.gear.common.utils.StringUtils;
|
||||
import com.gear.oa.domain.OaExpressQuestion;
|
||||
import com.gear.oa.domain.bo.OaExpressQuestionBo;
|
||||
import com.gear.oa.domain.vo.OaExpressQuestionVo;
|
||||
import com.gear.oa.mapper.OaExpressQuestionMapper;
|
||||
import com.gear.oa.service.IOaExpressQuestionService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 快递问题Service业务层处理
|
||||
*
|
||||
* @author hdka
|
||||
* @date 2025-07-21
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class OaExpressQuestionServiceImpl implements IOaExpressQuestionService {
|
||||
|
||||
private final OaExpressQuestionMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询快递问题
|
||||
*/
|
||||
@Override
|
||||
public OaExpressQuestionVo queryById(Long questionId){
|
||||
return baseMapper.selectVoById(questionId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询快递问题列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<OaExpressQuestionVo> queryPageList(OaExpressQuestionBo bo, PageQuery pageQuery) {
|
||||
QueryWrapper<OaExpressQuestion> lqw = buildQueryWrapperPlus(bo);
|
||||
Page<OaExpressQuestionVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询快递问题列表
|
||||
*/
|
||||
@Override
|
||||
public List<OaExpressQuestionVo> queryList(OaExpressQuestionBo bo) {
|
||||
LambdaQueryWrapper<OaExpressQuestion> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
private LambdaQueryWrapper<OaExpressQuestion> buildQueryWrapper(OaExpressQuestionBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<OaExpressQuestion> lqw = new LambdaQueryWrapper<>();
|
||||
|
||||
if (bo.getExpressId() != null) {
|
||||
lqw.eq(OaExpressQuestion::getExpressId, bo.getExpressId());
|
||||
}
|
||||
if (StringUtils.isNotBlank(bo.getDescription())) {
|
||||
lqw.eq(OaExpressQuestion::getDescription, bo.getDescription());
|
||||
}
|
||||
if (bo.getReportTime() != null) {
|
||||
lqw.eq(OaExpressQuestion::getReportTime, bo.getReportTime());
|
||||
}
|
||||
if (StringUtils.isNotBlank(bo.getReportBy())) {
|
||||
lqw.eq(OaExpressQuestion::getReportBy, bo.getReportBy());
|
||||
}
|
||||
if (bo.getStatus() != null) {
|
||||
lqw.eq(OaExpressQuestion::getStatus, bo.getStatus());
|
||||
}
|
||||
return lqw;
|
||||
}
|
||||
|
||||
private QueryWrapper<OaExpressQuestion> buildQueryWrapperPlus(OaExpressQuestionBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
QueryWrapper<OaExpressQuestion> qw = new QueryWrapper<>();
|
||||
// 设置表别名
|
||||
if (bo.getExpressId() != null) {
|
||||
qw.eq("oeq.express_id", bo.getExpressId());
|
||||
}
|
||||
if (StringUtils.isNotBlank(bo.getDescription())) {
|
||||
qw.eq("oeq.description", bo.getDescription());
|
||||
}
|
||||
if (bo.getReportTime() != null) {
|
||||
qw.eq("oeq.report_time", bo.getReportTime());
|
||||
}
|
||||
if (StringUtils.isNotBlank(bo.getReportBy())) {
|
||||
qw.eq("oeq.report_by", bo.getReportBy());
|
||||
}
|
||||
if (bo.getStatus() != null) {
|
||||
qw.eq("oeq.status", bo.getStatus());
|
||||
}
|
||||
// 逻辑删除
|
||||
qw.eq("oeq.del_flag", 0);
|
||||
|
||||
return qw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增快递问题
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(OaExpressQuestionBo bo) {
|
||||
OaExpressQuestion add = BeanUtil.toBean(bo, OaExpressQuestion.class);
|
||||
validEntityBeforeSave(add);
|
||||
add.setReportBy(LoginHelper.getNickName());
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setQuestionId(add.getQuestionId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改快递问题
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(OaExpressQuestionBo bo) {
|
||||
OaExpressQuestion update = BeanUtil.toBean(bo, OaExpressQuestion.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(OaExpressQuestion entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除快递问题
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,246 @@
|
||||
package com.gear.oa.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.gear.common.core.domain.PageQuery;
|
||||
import com.gear.common.core.page.TableDataInfo;
|
||||
import com.gear.common.utils.StringUtils;
|
||||
import com.gear.oa.domain.OaExpress;
|
||||
import com.gear.oa.domain.bo.OaExpressBo;
|
||||
import com.gear.oa.domain.vo.OaExpressVo;
|
||||
import com.gear.oa.mapper.OaExpressMapper;
|
||||
import com.gear.oa.service.IOaExpressService;
|
||||
import com.gear.oa.utils.*;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 物流预览Service业务层处理
|
||||
*
|
||||
* @author hdka
|
||||
* @date 2025-07-20
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class OaExpressServiceImpl implements IOaExpressService {
|
||||
|
||||
private final OaExpressMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询物流预览
|
||||
*/
|
||||
@Override
|
||||
public OaExpressVo queryById(Long expressId){
|
||||
return baseMapper.selectVoByIdPlus(expressId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询物流预览列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<OaExpressVo> queryPageList(OaExpressBo bo, PageQuery pageQuery) {
|
||||
QueryWrapper<OaExpress> lqw = buildQueryWrapperPlus(bo);
|
||||
Page<OaExpressVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询物流预览列表
|
||||
*/
|
||||
@Override
|
||||
public List<OaExpressVo> queryList(OaExpressBo bo) {
|
||||
LambdaQueryWrapper<OaExpress> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
private LambdaQueryWrapper<OaExpress> buildQueryWrapper(OaExpressBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<OaExpress> lqw = new LambdaQueryWrapper<>();
|
||||
if (StringUtils.isNotBlank(bo.getExpressCode())) {
|
||||
lqw.like(OaExpress::getExpressCode, bo.getExpressCode());
|
||||
}
|
||||
if (bo.getStatus() != null) {
|
||||
lqw.eq(OaExpress::getStatus, bo.getStatus());
|
||||
}
|
||||
if (StringUtils.isNotBlank(bo.getSupplyName())) {
|
||||
lqw.like(OaExpress::getSupplyName, bo.getSupplyName());
|
||||
}
|
||||
if (StringUtils.isNotBlank(bo.getSupplyPhone())) {
|
||||
lqw.eq(OaExpress::getSupplyPhone, bo.getSupplyPhone());
|
||||
}
|
||||
if (bo.getOwnerId() != null) {
|
||||
lqw.eq(OaExpress::getOwnerId, bo.getOwnerId());
|
||||
}
|
||||
if (StringUtils.isNotBlank(bo.getOwnerPhone())) {
|
||||
lqw.eq(OaExpress::getOwnerPhone, bo.getOwnerPhone());
|
||||
}
|
||||
if (bo.getPlanDate() != null) {
|
||||
lqw.eq(OaExpress::getPlanDate, bo.getPlanDate());
|
||||
}
|
||||
if (StringUtils.isNotBlank(bo.getExpressType())) {
|
||||
lqw.eq(OaExpress::getExpressType, bo.getExpressType());
|
||||
}
|
||||
return lqw;
|
||||
}
|
||||
|
||||
private QueryWrapper<OaExpress> buildQueryWrapperPlus(OaExpressBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
QueryWrapper<OaExpress> qw = new QueryWrapper<>();
|
||||
// 设置表别名
|
||||
if (StringUtils.isNotBlank(bo.getExpressCode())) {
|
||||
qw.like("oe.express_code", bo.getExpressCode());
|
||||
}
|
||||
if (bo.getStatus() != null) {
|
||||
qw.eq("oe.status", bo.getStatus());
|
||||
}
|
||||
if (StringUtils.isNotBlank(bo.getSupplyName())) {
|
||||
qw.like("oe.supply_name", bo.getSupplyName());
|
||||
}
|
||||
if (StringUtils.isNotBlank(bo.getSupplyPhone())) {
|
||||
qw.eq("oe.supply_phone", bo.getSupplyPhone());
|
||||
}
|
||||
if (bo.getOwnerId() != null) {
|
||||
qw.eq("oe.owner_id", bo.getOwnerId());
|
||||
}
|
||||
if (StringUtils.isNotBlank(bo.getOwnerPhone())) {
|
||||
qw.eq("oe.owner_phone", bo.getOwnerPhone());
|
||||
}
|
||||
if (bo.getPlanDate() != null) {
|
||||
qw.eq("oe.plan_date", bo.getPlanDate());
|
||||
}
|
||||
if (StringUtils.isNotBlank(bo.getExpressType())) {
|
||||
qw.eq("oe.express_type", bo.getExpressType());
|
||||
}
|
||||
// 添加逻辑删除条件
|
||||
qw.eq("oe.del_flag", 0);
|
||||
|
||||
return qw;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 新增物流预览
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(OaExpressBo bo) {
|
||||
OaExpress add = BeanUtil.toBean(bo, OaExpress.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setExpressId(add.getExpressId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改物流预览
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(OaExpressBo bo) {
|
||||
OaExpress update = BeanUtil.toBean(bo, OaExpress.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(OaExpress entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除物流预览
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取所有需要刷新的快递ID（示例：所有类型为SF且状态为1的快递单）
|
||||
*/
|
||||
public List<Long> getAllSfExpressIdsToRefresh() {
|
||||
LambdaQueryWrapper<OaExpress> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(OaExpress::getExpressType, "SF");
|
||||
lqw.eq(OaExpress::getStatus, 1L);
|
||||
List<OaExpress> list = baseMapper.selectList(lqw);
|
||||
return list.stream().map(OaExpress::getExpressId).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean getRefreshExpress(List<Long> expressIds) throws IOException {
|
||||
for (Long expressId : expressIds) {
|
||||
OaExpressVo oaExpressVo = baseMapper.selectVoById(expressId);
|
||||
String expressType = oaExpressVo.getExpressType();
|
||||
if (expressType.equals("SF") && oaExpressVo.getStatus() ==1L) {
|
||||
// 校验为顺丰则进入此位置更新状态
|
||||
String result = SfRouteQueryUtil.queryRoute(oaExpressVo.getExpressCode(), oaExpressVo.getOwnerPhone() != null ? oaExpressVo.getOwnerPhone() : oaExpressVo.getSupplyPhone());
|
||||
OaExpressVo oaExpressVo1 = SfRouteQueryUtil.parseData(result);
|
||||
if (oaExpressVo1 != null) {
|
||||
oaExpressVo.setLastUpdateTime(oaExpressVo1.getAcceptTime());
|
||||
oaExpressVo.setLastStatus(oaExpressVo1.getFirstStatusName());
|
||||
}
|
||||
}
|
||||
if (expressType.equals("ZTO") && oaExpressVo.getStatus() ==1L) {
|
||||
// 校验为顺丰则进入此位置更新状态
|
||||
OaExpressVo oaExpressVo1 = ZtoTrackQueryUtil.queryTrack(oaExpressVo.getExpressCode(), oaExpressVo.getOwnerPhone() != null ? oaExpressVo.getOwnerPhone() : oaExpressVo.getSupplyPhone());
|
||||
if (oaExpressVo1 != null) {
|
||||
oaExpressVo.setLastUpdateTime(oaExpressVo1.getAcceptTime());
|
||||
oaExpressVo.setLastStatus(oaExpressVo1.getFirstStatusName());
|
||||
}
|
||||
}
|
||||
if (expressType.equals("Best") && oaExpressVo.getStatus() ==1L) {
|
||||
// 校验为顺丰则进入此位置更新状态
|
||||
OaExpressVo oaExpressVo1 = BestRouteQueryUtil.queryRoute(oaExpressVo.getExpressCode());
|
||||
|
||||
if (oaExpressVo1 != null) {
|
||||
oaExpressVo.setLastUpdateTime(oaExpressVo1.getAcceptTime());
|
||||
oaExpressVo.setLastStatus(oaExpressVo1.getFirstStatusName());
|
||||
}
|
||||
}
|
||||
if (expressType.equals("YD") && oaExpressVo.getStatus() == 1L) {
|
||||
// 韵达快递轨迹查询
|
||||
String result = com.gear.oa.utils.YdRouteQueryUtil.queryRoute(oaExpressVo.getExpressCode());
|
||||
OaExpressVo ydVo = YdRouteQueryUtil.parseData(result);
|
||||
if (ydVo != null) {
|
||||
oaExpressVo.setLastUpdateTime(ydVo.getLastUpdateTime());
|
||||
oaExpressVo.setLastStatus(ydVo.getLastStatus());
|
||||
}
|
||||
}
|
||||
if (expressType.equals("YT") && oaExpressVo.getStatus() == 1L) {
|
||||
// 圆通快递轨迹查询
|
||||
String result = com.gear.oa.utils.YtRouteQueryUtil.queryRoute(oaExpressVo.getExpressCode());
|
||||
OaExpressVo ytVo = YtRouteQueryUtil.parseData(result);
|
||||
if (ytVo != null) {
|
||||
oaExpressVo.setLastUpdateTime(ytVo.getLastUpdateTime());
|
||||
oaExpressVo.setLastStatus(ytVo.getLastStatus());
|
||||
}
|
||||
}
|
||||
if (expressType.equals("STO") && oaExpressVo.getStatus() == 1L) {
|
||||
// 申通快递轨迹查询
|
||||
String result = StoRouteQueryUtil.queryRoute(Collections.singletonList(oaExpressVo.getExpressCode()));
|
||||
OaExpressVo stoVo = StoRouteQueryUtil.parseData(result);
|
||||
if (stoVo != null) {
|
||||
oaExpressVo.setLastUpdateTime(stoVo.getAcceptTime());
|
||||
oaExpressVo.setLastStatus(stoVo.getFirstStatusName());
|
||||
}
|
||||
}
|
||||
OaExpress add = BeanUtil.toBean(oaExpressVo, OaExpress.class);
|
||||
baseMapper.updateById(add);;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,135 @@
|
||||
package com.gear.oa.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.gear.common.core.domain.PageQuery;
|
||||
import com.gear.common.core.page.TableDataInfo;
|
||||
import com.gear.common.helper.LoginHelper;
|
||||
import com.gear.oa.domain.OaFeedback;
|
||||
import com.gear.oa.domain.bo.OaFeedbackBo;
|
||||
import com.gear.oa.domain.vo.OaFeedbackVo;
|
||||
import com.gear.oa.mapper.OaFeedbackMapper;
|
||||
import com.gear.oa.service.IOaFeedbackService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.val;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 问题反馈Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-03-28
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class OaFeedbackServiceImpl implements IOaFeedbackService {
|
||||
|
||||
private final OaFeedbackMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询问题反馈
|
||||
*/
|
||||
@Override
|
||||
public OaFeedbackVo queryById(Long feedbackId){
|
||||
return baseMapper.selectVoById(feedbackId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询问题反馈列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<OaFeedbackVo> queryPageList(OaFeedbackBo bo, PageQuery pageQuery) {
|
||||
QueryWrapper<OaFeedback> lqw = buildQueryWrapper(bo);
|
||||
val result = baseMapper.selectVoPageAndStatus(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查询问题反馈列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<OaFeedbackVo> indexQueryList(OaFeedbackBo bo, PageQuery pageQuery) {
|
||||
QueryWrapper<OaFeedback> lqw = buildQueryWrapper(bo);
|
||||
lqw.eq("ofi.status", 0L);
|
||||
val result = baseMapper.selectVoPageAndStatus(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询问题反馈列表
|
||||
*/
|
||||
@Override
|
||||
public List<OaFeedbackVo> queryList(OaFeedbackBo bo) {
|
||||
QueryWrapper<OaFeedback> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private QueryWrapper<OaFeedback> buildQueryWrapper(OaFeedbackBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
QueryWrapper<OaFeedback> lqw = Wrappers.query();
|
||||
lqw.eq("ofi.user_id", LoginHelper.getUserId());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增问题反馈
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(OaFeedbackBo bo) {
|
||||
|
||||
OaFeedback add = BeanUtil.toBean(bo, OaFeedback.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setFeedbackId(add.getFeedbackId());
|
||||
}
|
||||
baseMapper.insertItem(add.getFeedbackId());
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改问题反馈
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(OaFeedbackBo bo) {
|
||||
OaFeedback update = BeanUtil.toBean(bo, OaFeedback.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(OaFeedback entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除问题反馈
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean updateToRead(OaFeedbackBo bo) {
|
||||
|
||||
return baseMapper.updateToRead(bo.getFeedbackId(),LoginHelper.getUserId())>0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int delItem(Long feedbackId) {
|
||||
|
||||
return baseMapper.delItem(feedbackId,LoginHelper.getUserId());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,220 @@
|
||||
package com.gear.oa.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.gear.common.core.domain.PageQuery;
|
||||
import com.gear.common.core.page.TableDataInfo;
|
||||
import com.gear.common.helper.LoginHelper;
|
||||
import com.gear.common.utils.StringUtils;
|
||||
import com.gear.oa.domain.OaReport;
|
||||
import com.gear.oa.domain.bo.OaReportBo;
|
||||
import com.gear.oa.domain.vo.OaReportVo;
|
||||
import com.gear.oa.domain.vo.ReportCardVo;
|
||||
import com.gear.oa.domain.vo.ReportPieVo;
|
||||
import com.gear.oa.domain.vo.ReportTrendVo;
|
||||
import com.gear.oa.mapper.OaReportMapper;
|
||||
import com.gear.oa.service.IOaReportService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.ZoneId;
|
||||
import java.util.Collection;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 项目报工Service业务层处理
|
||||
*
|
||||
* @author hdka
|
||||
* @date 2025-06-16
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class OaReportServiceImpl implements IOaReportService {
|
||||
|
||||
private final OaReportMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询项目报工
|
||||
*/
|
||||
@Override
|
||||
public OaReportVo queryById(Long reportId){
|
||||
return baseMapper.selectVoByIdPlus(reportId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询项目报工列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<OaReportVo> queryPageList(OaReportBo bo, PageQuery pageQuery) {
|
||||
QueryWrapper<OaReport> lqw = buildQueryWrapper(bo);
|
||||
Page<OaReportVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询项目报工列表
|
||||
*/
|
||||
@Override
|
||||
public List<OaReportVo> queryList(OaReportBo bo) {
|
||||
return baseMapper.selectAll(bo);
|
||||
}
|
||||
|
||||
|
||||
private QueryWrapper<OaReport> buildQueryWrapper(OaReportBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
QueryWrapper<OaReport> lqw = Wrappers.query();
|
||||
lqw.eq("opr.del_flag", 0);
|
||||
lqw.eq(bo.getUserId()!=null, "opr.user_id", bo.getUserId());
|
||||
lqw.eq(bo.getWorkType()!=null, "opr.work_type", bo.getWorkType());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getNickName()), "su.nick_name", bo.getNickName());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getProjectNum()), "op.project_num", bo.getProjectNum());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getProjectCode()), "op.project_code", bo.getProjectCode());
|
||||
lqw.eq(bo.getDeptId()!=null, "su.dept_id", bo.getDeptId());
|
||||
if (bo.getCreateTime() != null) {
|
||||
LocalDateTime start = bo.getCreateTime() // LocalDateTime / Date 都行
|
||||
.toInstant()
|
||||
.atZone(ZoneId.systemDefault())
|
||||
.toLocalDate() // 先取日期
|
||||
.atStartOfDay(); // 00:00:00
|
||||
LocalDateTime end = start.plusDays(1); // 下一天 00:00:00
|
||||
|
||||
lqw.ge("opr.create_time", start)
|
||||
.lt("opr.create_time", end); // [start, end)
|
||||
}
|
||||
lqw.orderByDesc("opr.create_time");
|
||||
return lqw;
|
||||
}
|
||||
|
||||
private QueryWrapper<OaReport> ClearbuildQueryWrapper(OaReportBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
QueryWrapper<OaReport> lqw = Wrappers.query();
|
||||
if (bo.getCreateTime() != null) {
|
||||
LocalDateTime start = bo.getCreateTime() // LocalDateTime / Date 都行
|
||||
.toInstant()
|
||||
.atZone(ZoneId.systemDefault())
|
||||
.toLocalDate() // 先取日期
|
||||
.atStartOfDay(); // 00:00:00
|
||||
LocalDateTime end = start.plusDays(1); // 下一天 00:00:00
|
||||
|
||||
lqw.ge("create_time", start)
|
||||
.lt("create_time", end); // [start, end)
|
||||
}
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增项目报工
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(OaReportBo bo) {
|
||||
OaReport add = BeanUtil.toBean(bo, OaReport.class);
|
||||
validEntityBeforeSave(add);
|
||||
add.setUserId(LoginHelper.getUserId());
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setReportId(add.getReportId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改项目报工
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(OaReportBo bo) {
|
||||
OaReport update = BeanUtil.toBean(bo, OaReport.class);
|
||||
// 如果time字段不为空，则用time覆盖createTime
|
||||
if (bo.getTime() != null) {
|
||||
update.setCreateTime(bo.getTime());
|
||||
}
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(OaReport entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除项目报工
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ReportCardVo getCardData() {
|
||||
ReportCardVo reportCardVo = new ReportCardVo();
|
||||
OaReportBo oaReportBo = new OaReportBo();
|
||||
oaReportBo.setCreateTime(new Date());
|
||||
QueryWrapper<OaReport> oaProjectReportQueryWrapper = ClearbuildQueryWrapper(oaReportBo);
|
||||
// 查询今日数据
|
||||
reportCardVo.setTodayCount(baseMapper.selectCount(oaProjectReportQueryWrapper));
|
||||
oaProjectReportQueryWrapper.select("DISTINCT project_id");
|
||||
reportCardVo.setInProgressProjects(baseMapper.selectCount(oaProjectReportQueryWrapper));
|
||||
reportCardVo.setExceptions(baseMapper.countWithPending(new Date()));
|
||||
reportCardVo.setCompletionRate(baseMapper.countWithCompleted(new Date()));
|
||||
|
||||
// 把 new Date() 换成昨天
|
||||
Date yesterday = Date.from(
|
||||
LocalDate.now()
|
||||
.minusDays(1) // 昨天的日期
|
||||
.atStartOfDay(ZoneId.systemDefault()) // 当天零点
|
||||
.toInstant()
|
||||
);
|
||||
oaReportBo.setCreateTime(yesterday);
|
||||
// 查询昨日报工数据两
|
||||
reportCardVo.setTodayCountChange(baseMapper.selectCount(ClearbuildQueryWrapper(oaReportBo)));
|
||||
|
||||
// 查询昨日涉及项目数据量
|
||||
oaProjectReportQueryWrapper.select("DISTINCT project_id");
|
||||
reportCardVo.setProjectChange(baseMapper.selectCount(oaProjectReportQueryWrapper));
|
||||
reportCardVo.setCompletionChange(baseMapper.countWithCompleted(yesterday));
|
||||
return reportCardVo;
|
||||
}
|
||||
|
||||
public List<ReportTrendVo> getTrend(LocalDate start, LocalDate end) {
|
||||
return baseMapper.selectReportTrend(start, end);
|
||||
}
|
||||
|
||||
public List<ReportPieVo> getDistribution(LocalDate start, LocalDate end) {
|
||||
return baseMapper.selectProjectDistribution(start,end);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<OaReportVo> getRankData(LocalDate start, LocalDate end) {
|
||||
|
||||
return baseMapper.selectRankData(start,end);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<OaReportVo> getProjects(LocalDate start, LocalDate end) {
|
||||
return baseMapper.getProjects(start,end);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<OaReportVo> clearList(LocalDate start, LocalDate end) {
|
||||
|
||||
return baseMapper.getClearList(start,end);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<OaReportVo> getSummaryData(LocalDate start, LocalDate end) {
|
||||
|
||||
return baseMapper.getSummaryData(start,end);
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user