Browse Source

修改bug

ptos
lucky 4 years ago
parent
commit
5ef12da40f
  1. 4
      src/main/java/com/ccsens/ptccsens/bean/vo/ProjectFinanceVo.java
  2. 2
      src/main/java/com/ccsens/ptccsens/service/ProjectFinanceService.java
  3. 4
      src/main/resources/application.yml

4
src/main/java/com/ccsens/ptccsens/bean/vo/ProjectFinanceVo.java

@ -53,12 +53,12 @@ public class ProjectFinanceVo {
private Long submitTime; private Long submitTime;
@ApiModelProperty("审查人和当前记录的关联id") @ApiModelProperty("审查人和当前记录的关联id")
private Long financeCheckId; private Long financeCheckId;
@ApiModelProperty("当前状态") @ApiModelProperty("当前状态(0未审核 1已通过 2驳回)")
private Byte applyType; private Byte applyType;
} }
@Data @Data
@ApiModel("查看自己需要审批的申请-返参") @ApiModel("查看项目下的财务信息-返参")
public static class FinanceOfProject { public static class FinanceOfProject {
@ApiModelProperty("任务id") @ApiModelProperty("任务id")
private Long taskDetailId; private Long taskDetailId;

2
src/main/java/com/ccsens/ptccsens/service/ProjectFinanceService.java

@ -102,7 +102,7 @@ public class ProjectFinanceService implements IProjectFinanceService{
//a.如果存在,直接修改预算或奖金 //a.如果存在,直接修改预算或奖金
if (ObjectUtil.isNotNull(pluFinance)) { if (ObjectUtil.isNotNull(pluFinance)) {
PluFinance updatePluFinance = new PluFinance(); PluFinance updatePluFinance = new PluFinance();
updatePluFinance.setId(param.getTaskDetailId()); updatePluFinance.setId(param.getTaskFinanceId());
if (ObjectUtil.isNotNull(param.getBonus()) && 0 != param.getBonus()) { if (ObjectUtil.isNotNull(param.getBonus()) && 0 != param.getBonus()) {
updatePluFinance.setBonus(param.getBonus()); updatePluFinance.setBonus(param.getBonus());
pluFinanceDao.updateByPrimaryKeySelective(updatePluFinance); pluFinanceDao.updateByPrimaryKeySelective(updatePluFinance);

4
src/main/resources/application.yml

@ -1,4 +1,4 @@
spring: spring:
profiles: profiles:
active: dev active: test
include: common, util-dev include: common, util-test

Loading…
Cancel
Save