CpopSZ/Cpop-Union
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改报销类

Browse Source
This commit is contained in:
DB 2024-01-11 22:18:19 +08:00
parent 0508482e0c
commit ef8ff160ca
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cpop-Oam/src/main/java/com/cpop/oam/business/entity/FinanceReimburseStage.java
View File

@ -1,5 +1,6 @@
package com.cpop.oam.business.entity; package com.cpop.oam.business.entity;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table; import com.mybatisflex.annotation.Table;
import com.cpop.core.base.entity.BaseEntity; import com.cpop.core.base.entity.BaseEntity;
@ -48,13 +49,10 @@ public class FinanceReimburseStage extends BaseEntity implements Serializable {
*/ */
private LocalDateTime paymentTime; private LocalDateTime paymentTime;
/** /**
* 逻辑删除（1否0是） * 逻辑删除（1否0是）
*/ */
private Boolean deleted; @Column(isLogicDelete = true)
private Boolean isDelete;
} }

5
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/FinanceReimburseServiceImpl.java
View File

@ -146,6 +146,7 @@ public class FinanceReimburseServiceImpl extends ServiceImpl<FinanceReimburseMap
} else { } else {
entity.setFinanceReimburseId(item.getId()).setPaymentTime(now).setStageAmount(item.getPrice()); entity.setFinanceReimburseId(item.getId()).setPaymentTime(now).setStageAmount(item.getPrice());
} }
financeReimburseStages.add(entity);
item.setStatus(2); item.setStatus(2);
}); });
} }
@ -243,9 +244,7 @@ public class FinanceReimburseServiceImpl extends ServiceImpl<FinanceReimburseMap
} }
} }
FinanceReimburseStage entity = new FinanceReimburseStage(); FinanceReimburseStage entity = new FinanceReimburseStage();
BeanUtils.copyBeanProp(entity, bo); entity.setFinanceReimburseId(bo.getId()).setPaymentTime(bo.getPaymentTime()).setStageAmount(bo.getStageAmount());
entity.setFinanceReimburseId(bo.getId())
.setId(null);
stageService.save(entity); stageService.save(entity);
//更新报销记录 //更新报销记录
this.updateById(financeReimburse); this.updateById(financeReimburse);