lin 3 лет назад
Родитель
Сommit
a08f936b51
3 измененных файлов: 30 добавлений и 8 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxRentContractService.java
  3. +27
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Просмотреть файл

@@ -309,7 +309,7 @@ public class WxRentContractController extends WxContractBaseController {
} }
ResultData update = null; ResultData update = null;
try { try {
update = wxRentContractService.update(rentContract, user.getId(), user.getName(), EnumFromType.OTHER.getCode(), oldDate,false);
update = wxRentContractService.updateOneStep(rentContract, user.getId(), user.getName(), EnumFromType.OTHER.getCode(), oldDate,false);
} catch (MallinkException e) { } catch (MallinkException e) {
return new ResultData(update.code,update.message); return new ResultData(update.code,update.message);
} }


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxRentContractService.java Просмотреть файл

@@ -47,6 +47,8 @@ public interface WxRentContractService {
ResultData save(WxRentContract record,Long userId,String userName,Date oldRentStartDate); ResultData save(WxRentContract record,Long userId,String userName,Date oldRentStartDate);


ResultData update(WxRentContract record, Long userId,String userName,int from,Date oldRentStartDate,boolean writeComplate); ResultData update(WxRentContract record, Long userId,String userName,int from,Date oldRentStartDate,boolean writeComplate);
ResultData updateOneStep(WxRentContract record, Long userId,String userName,int from,Date oldRentStartDate,boolean writeComplate);


/** /**
* 根据Id删除实体 * 根据Id删除实体


+ 27
- 7
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -521,13 +521,13 @@ public class WxRentContractServiceImpl implements WxRentContractService {
} }


//生成预览账单(补录第二步,第三步走编辑) //生成预览账单(补录第二步,第三步走编辑)
if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null
&& !record.getReceivePeriod().equals(0) && !record.getLease().equals(0)) {
wxBillRentMapper.deletePreviewBill(record);
//重新生成
List<WxBillRent> resultList = buildRent(null, record, EnumIsPreview.YES.getCode(),true);
record.setPreviewBillRentList(resultList);
}
// if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null
// && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0)) {
// wxBillRentMapper.deletePreviewBill(record);
// //重新生成
// List<WxBillRent> resultList = buildRent(null, record, EnumIsPreview.YES.getCode(),true);
// record.setPreviewBillRentList(resultList);
// }


//创建预览账单 //创建预览账单
// List<WxBillRent> resultList = buildRent(null, record, EnumIsPreview.YES.getCode(),true); // List<WxBillRent> resultList = buildRent(null, record, EnumIsPreview.YES.getCode(),true);
@@ -618,6 +618,26 @@ public class WxRentContractServiceImpl implements WxRentContractService {
wxRentContract.setPreviewBillRentList(resultList); wxRentContract.setPreviewBillRentList(resultList);
return new ResultData(wxRentContract); return new ResultData(wxRentContract);
} }
@Transactional(rollbackFor = {Exception.class})
@Override
public ResultData updateOneStep(WxRentContract record, Long userId,String userName,int from,Date oldRentStartDate,boolean writeComplate) {
//查询预账单用于展示
WxBillRent wxBillRent = new WxBillRent();
wxBillRent.setRentContractId(record.getId());
wxBillRent.setSortColumns(BaseEntity.SortField.Period_ASC);
wxBillRent.setIsPreview(EnumIsPreview.YES.getCode());
List<WxBillRent> resultList = wxBillRentMapper.findList(wxBillRent);

//更新
ResultData resultData = getResultDataForUpdate(record, userId,from,oldRentStartDate,writeComplate);
if (resultData.code != Result.SUCCESS) {
return resultData;
}
WxRentContract wxRentContract = (WxRentContract)resultData.data;
wxRentContract.setPreviewBillRentList(resultList);
return new ResultData(wxRentContract);
}


/** /**
* 重新生成账单(预账单调整) * 重新生成账单(预账单调整)


Загрузка…
Отмена
Сохранить