Commit 358c4d5a authored by chenzhao's avatar chenzhao

修复audit bug

parent 8bf1ad97
...@@ -341,6 +341,9 @@ public class PreparationMoneyController extends BaseController { ...@@ -341,6 +341,9 @@ public class PreparationMoneyController extends BaseController {
public ResponseModel<PreparationMoney> getFromInfo( public ResponseModel<PreparationMoney> getFromInfo(
@RequestParam(value = "ids") String ids){ @RequestParam(value = "ids") String ids){
List<String> list = Arrays.asList(ids.split(",")); List<String> list = Arrays.asList(ids.split(","));
AgencyUserModel userInfo = getUserInfo();
PreparationMoney fromInfo = preparationMoneyServiceImpl.getFromInfo(list);
fromInfo.setOrderUser(userInfo.getRealName());
return ResponseHelper.buildResponse(preparationMoneyServiceImpl.getFromInfo(list)) ; return ResponseHelper.buildResponse(preparationMoneyServiceImpl.getFromInfo(list)) ;
} }
} }
...@@ -1071,11 +1071,18 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto ...@@ -1071,11 +1071,18 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
//补货审核 //补货审核
public void replenishmentAudit(Long sequenceNbr,Map<String, Object> kv) { public void replenishmentAudit(Long sequenceNbr,Map<String, Object> kv) {
PreparationMoney preparationMoney = preparationMoneyMapper.selectById(sequenceNbr); PreparationMoney preparationMoney = preparationMoneyMapper.selectById(sequenceNbr);
LambdaQueryWrapper<DocumentStation> stations = new LambdaQueryWrapper<>();
stations.eq(DocumentStation::getPreparationMoneyId,sequenceNbr);
List<DocumentStation> documentStations = documentStationMapper.selectList(stations);
List<Long> collect = documentStations.stream().map(DocumentStation::getStationId).collect(Collectors.toList());
LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
if (kv.get("approvalStatus").toString().equals("0")){ if (kv.get("approvalStatus").toString().equals("0")){
preparationMoney.setOrderStatus(DeliveryStateeEnum.待补货.getName()); preparationMoney.setOrderStatus(DeliveryStateeEnum.待补货.getName());
up.set(PeasantHousehold::getPreparationMoneyState, DeliveryStateeEnum.待补货.getName()); up.set(PeasantHousehold::getPreparationMoneyState, DeliveryStateeEnum.待补货.getName());
up.set(PeasantHousehold::getConstructionState, DeliveryStateeEnum.待补货.getName()); up.set(PeasantHousehold::getConstructionState, DeliveryStateeEnum.待补货.getName());
up.in(BaseEntity::getSequenceNbr,collect);
peasantHouseholdMapper.update(null,up); peasantHouseholdMapper.update(null,up);
}else { }else {
preparationMoney.setOrderStatus(DeliveryStateeEnum.待确认.getName()); preparationMoney.setOrderStatus(DeliveryStateeEnum.待确认.getName());
...@@ -1198,6 +1205,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto ...@@ -1198,6 +1205,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
stations.add(documentStation); stations.add(documentStation);
}); });
preparationMoney.setPeasantHouseholdId(stations); preparationMoney.setPeasantHouseholdId(stations);
preparationMoney.setOrderTime(new Date());
return preparationMoney; return preparationMoney;
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment