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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Joshi
2025-08-19 16:38:07 +08:00
parent 5148225c16 e7b0791388
commit e5c8fcae19
8 changed files with 97 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaExpressServiceImpl.java
View File

@@ -188,10 +188,13 @@ public class OaExpressServiceImpl implements IOaExpressService {
@Override
public Boolean getRefreshExpress(List<Long> expressIds) throws IOException {
System.out.println("12313123123");
for (Long expressId : expressIds) {
OaExpressVo oaExpressVo = baseMapper.selectVoById(expressId);
String expressType = oaExpressVo.getExpressType();
System.out.println(expressType);
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);

14
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaFeedbackServiceImpl.java
View File

@@ -6,8 +6,6 @@ import com.ruoyi.common.helper.LoginHelper;
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 lombok.val;
@@ -39,7 +37,7 @@ public class OaFeedbackServiceImpl implements IOaFeedbackService {
*/
@Override
public OaFeedbackVo queryById(Long feedbackId){
return baseMapper.selectVoById(feedbackId);
return baseMapper.selectVoByIdPlus(feedbackId);
}
/**
@@ -77,6 +75,15 @@ public class OaFeedbackServiceImpl implements IOaFeedbackService {
Map<String, Object> params = bo.getParams();
QueryWrapper<OaFeedback> lqw = Wrappers.query();
lqw.eq("ofi.user_id", LoginHelper.getUserId());
lqw.eq(bo.getProjectId()!= null, "oaf.project_id",bo.getProjectId());
lqw.like(StringUtils.isNotBlank(bo.getTitle()), "oaf.title", bo.getTitle());
lqw.like(StringUtils.isNotBlank(bo.getProjectName()), "sop.project_name", bo.getProjectName());
lqw.like(StringUtils.isNotBlank(bo.getProjectName()), "sop.project_code", bo.getProjectName());
lqw.like(StringUtils.isNotBlank(bo.getProjectName()), "sop.project_num", bo.getProjectName());
if (bo.getStartTime() != null && bo.getEndTime() != null) {
lqw.between("oaf.create_time", bo.getStartTime(), bo.getEndTime());
}
lqw.orderByDesc("oaf.create_time");
return lqw;
}
@@ -88,6 +95,7 @@ public class OaFeedbackServiceImpl implements IOaFeedbackService {
OaFeedback add = BeanUtil.toBean(bo, OaFeedback.class);
validEntityBeforeSave(add);
add.setCreateBy(LoginHelper.getNickName());
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setFeedbackId(add.getFeedbackId());