bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "代办优化" 

This reverts commit e4f42a6456.
This commit is contained in:
sxu 2025-01-22 13:53:39 +08:00
parent e4f42a6456
commit 6391be0117
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/ToDoBean.java
View File

@ -18,9 +18,6 @@ import java.util.Date;
public class ToDoBean extends BaseEntity { public class ToDoBean extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "true:出租方 false:承租方")
private boolean flag;
/** 任务ID */ /** 任务ID */
@ApiModelProperty(value = "任务ID") @ApiModelProperty(value = "任务ID")
private Long taskId; private Long taskId;

7
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java
View File

@ -25,12 +25,7 @@ public class ToDoServiceImpl implements ToDoService {
@Override @Override
public List<ToDoBean> getToDoList(ToDoBean bean) { public List<ToDoBean> getToDoList(ToDoBean bean) {
//true:出租方 false:承租方 bean.setBuyerCompanyId(Math.toIntExact(SecurityUtils.getLoginUser().getSysUser().getCompanyId()));
if (bean.isFlag()) {
bean.setSellerCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId().intValue());
} else {
bean.setBuyerCompanyId(Math.toIntExact(SecurityUtils.getLoginUser().getSysUser().getCompanyId()));
}
return toDoMapper.getToDoList(bean); return toDoMapper.getToDoList(bean);
} }

5
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/ToDoMapper.xml
View File

@ -24,10 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
tt.`status` = '1' and tt.task_status &lt; 20 tt.`status` = '1' and tt.task_status &lt; 20
and tt.task_type in (2) and tt.task_type in (2)
<if test="buyerCompanyId != null"> <if test="buyerCompanyId != null">
and tt.buyer_company_id=#{buyerCompanyId} and tt.buyer_company_id=#{buyerCompanyId} || tt.seller_company_id=#{buyerCompanyId}
</if>
<if test="sellerCompanyId != null">
and tt.seller_company_id=#{sellerCompanyId}
</if> </if>
<if test="taskTypeId != null and taskTypeId != ''"> <if test="taskTypeId != null and taskTypeId != ''">
and tt.task_type=#{taskTypeId} and tt.task_type=#{taskTypeId}