Browse Source

空指针修复

feature/teamB_zz_wgh
HAHA 3 years ago
parent
commit
846a8a281b
  1. 8
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberPointDTO.java
  2. 10
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java

8
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberPointDTO.java

@ -44,7 +44,7 @@ public class IcPartyMemberPointDTO implements Serializable {
/** /**
* 基础积分分值 * 基础积分分值
*/ */
private Integer basePoint = 0; private Integer basePoint;
/** /**
* 基础积分选项 英文逗号隔开 * 基础积分选项 英文逗号隔开
@ -54,7 +54,7 @@ public class IcPartyMemberPointDTO implements Serializable {
/** /**
* 民主评议积分分值 * 民主评议积分分值
*/ */
private Integer reviewPoint = 0; private Integer reviewPoint;
/** /**
* 民主评议积分选项 * 民主评议积分选项
@ -64,7 +64,7 @@ public class IcPartyMemberPointDTO implements Serializable {
/** /**
* 激励积分分值 * 激励积分分值
*/ */
private Integer inspirePoint = 0; private Integer inspirePoint;
/** /**
* 激励积分选项 * 激励积分选项
@ -74,7 +74,7 @@ public class IcPartyMemberPointDTO implements Serializable {
/** /**
* 警示扣分分值 * 警示扣分分值
*/ */
private Integer warnPoint = 0; private Integer warnPoint;
/** /**
* 警示扣分选项 * 警示扣分选项

10
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java

@ -83,17 +83,17 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl<IcPartyMember
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void save(IcPartyMemberPointDTO dto) { public void save(IcPartyMemberPointDTO dto) {
if(dto.getBasePoint() == 0){ if(dto.getBasePoint() == null){
dto.setBasePoint(NumConstant.ZERO); dto.setBasePoint(NumConstant.ZERO);
} }
if(dto.getReviewPoint() == 0){ if(dto.getReviewPoint() == null){
dto.setInspirePoint(NumConstant.ZERO); dto.setInspirePoint(NumConstant.ZERO);
} }
if(dto.getReviewPoint() == 0){ if(dto.getInspirePoint() == null){
dto.setReviewPoint(NumConstant.ZERO); dto.setInspirePoint(NumConstant.ZERO);
} }
dto.setTotalScore(dto.getBasePoint() + dto.getInspirePoint() + dto.getReviewPoint()); dto.setTotalScore(dto.getBasePoint() + dto.getInspirePoint() + dto.getReviewPoint());
if(dto.getWarnPoint() == 0) { if(dto.getWarnPoint() != null) {
if (dto.getWarnPoint() > 0) { if (dto.getWarnPoint() > 0) {
dto.setTotalScore(dto.getTotalScore() - dto.getWarnPoint()); dto.setTotalScore(dto.getTotalScore() - dto.getWarnPoint());
} else { } else {

Loading…
Cancel
Save