Bladeren bron

[BUG][修改][物业保存问题]

release_toaliyun_real
gongbiao 7 jaren geleden
bovenliggende
commit
c9d9098c15
3 gewijzigde bestanden met toevoegingen van 8 en 19 verwijderingen
  1. +6
    -17
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java

+ 6
- 17
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java Bestand weergeven

@@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.*;


import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.Date;
import java.util.Map; import java.util.Map;


/** /**
@@ -60,12 +59,11 @@ public class WxPropertyContractController extends BaseController {
MallUserInfo user = getUser(); MallUserInfo user = getUser();
wxPropertyContract.setTenantId(user.getTenantId()); wxPropertyContract.setTenantId(user.getTenantId());
wxPropertyContract.setAdjustPeriodHandle(); wxPropertyContract.setAdjustPeriodHandle();
Date oldDate = wxPropertyContract.getRentalStartDate();


if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
wxPropertyContract.setRentalStartDate(wxPropertyContract.getStartDate()); wxPropertyContract.setRentalStartDate(wxPropertyContract.getStartDate());
} }
return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(), oldDate);
return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName());
} }


@PostMapping("updateRentStartTime") @PostMapping("updateRentStartTime")
@@ -74,7 +72,6 @@ public class WxPropertyContractController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime"); logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime");
WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId());
propertyContract.setRentalStartDate(wxPropertyContract.getRentalStartDate()); propertyContract.setRentalStartDate(wxPropertyContract.getRentalStartDate());
Date oldDate = wxPropertyContract.getRentalStartDate();


if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
propertyContract.setRentalStartDate(propertyContract.getStartDate()); propertyContract.setRentalStartDate(propertyContract.getStartDate());
@@ -84,7 +81,7 @@ public class WxPropertyContractController extends BaseController {
propertyContract.setTenantId(user.getTenantId()); propertyContract.setTenantId(user.getTenantId());
propertyContract.setAdjustPeriodHandle(); propertyContract.setAdjustPeriodHandle();
propertyContract.setRentStartType(wxPropertyContract.getRentStartType()); propertyContract.setRentStartType(wxPropertyContract.getRentStartType());
return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName(), oldDate);
return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName());
} }




@@ -92,20 +89,12 @@ public class WxPropertyContractController extends BaseController {
@SystemControllerLog(description = "物业合同-修改") @SystemControllerLog(description = "物业合同-修改")
public ResultData update(@RequestBody WxPropertyContract wxPropertyContract) { public ResultData update(@RequestBody WxPropertyContract wxPropertyContract) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::update"); logger.debug("[" + getIpAddr() + "] WxPropertyContractController::update");
WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId());
propertyContract.setRentalStartDate(wxPropertyContract.getRentalStartDate());
Date oldDate = wxPropertyContract.getRentalStartDate();

if (wxPropertyContract.getRentStartType() != null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())) {
propertyContract.setRentalStartDate(propertyContract.getStartDate());
}

MallUserInfo user = getUser(); MallUserInfo user = getUser();
propertyContract.setTenantId(user.getTenantId());
propertyContract.setAdjustPeriodHandle();
propertyContract.setRentStartType(wxPropertyContract.getRentStartType());
wxPropertyContract.setTenantId(user.getTenantId());
wxPropertyContract.setAdjustPeriodHandle();
//第三步提交 SWITCH //第三步提交 SWITCH
return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(), oldDate);
return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName());

} }


@GetMapping("/del") @GetMapping("/del")


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java Bestand weergeven

@@ -40,7 +40,7 @@ public interface WxPropertyContractService {
* @param oldDate * @param oldDate
* @return * @return
*/ */
ResultData saveOrUpdate(WxPropertyContract record, Long userId, String userName, Date oldDate);
ResultData saveOrUpdate(WxPropertyContract record, Long userId, String userName);


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


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Bestand weergeven

@@ -211,7 +211,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService


@Override @Override
@Transactional(rollbackFor = {Exception.class}) @Transactional(rollbackFor = {Exception.class})
public ResultData saveOrUpdate(WxPropertyContract record, Long userId, String userName, Date oldDate) {
public ResultData saveOrUpdate(WxPropertyContract record, Long userId, String userName) {
// 保存调整金额(预账单调整) // 保存调整金额(预账单调整)
boolean haspreview = false; boolean haspreview = false;
if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){ if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){


Laden…
Annuleren
Opslaan