|
@@ -425,6 +425,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
|
|
|
public void completePreparation(PreparationDTO model) {
|
|
|
Preparation preparation = mapper.selectByPrimaryKey(model.getId());
|
|
|
Preparation updPre = new Preparation();
|
|
|
+ updPre.setActualFee(model.getActualFee());
|
|
|
updPre.setId(model.getId());
|
|
|
updPre.setFinishContent(model.getFinishContent());
|
|
|
updPre.setRepairEndTime(LocalDateTime.now());
|
|
@@ -735,6 +736,14 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
|
|
|
updPre.setApplyReason(model.getApplyReason());
|
|
|
updPre.setContent(model.getContent());
|
|
|
updPre.setFee(model.getFee());
|
|
|
+ updPre.setActualFee(model.getActualFee());
|
|
|
+ // 判断前后费用不一致
|
|
|
+ if(preparation.getActualFee().compareTo(model.getActualFee()) != 0){
|
|
|
+ // 判断修改人是否是执行人
|
|
|
+ if(!SecurityUtils.getUserInfo().getUserId().equals(preparation.getRepairUserId())){
|
|
|
+ throw new DeniedException("非执行人不能修改实际费用");
|
|
|
+ }
|
|
|
+ }
|
|
|
SysUserDTO queryUserDTO = new SysUserDTO();
|
|
|
List<SysUserVO> userVOS = null;
|
|
|
// 查询发送消息用户
|