winter пре 1 година
родитељ
комит
2170a8e130
3 измењених фајлова са 33 додато и 19 уклоњено
  1. +14
    -15
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +7
    -0
      mallinkAdmin/src/main/resources/db/migration/欢乐城拆分.sql
  3. +12
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 14
- 15
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Прегледај датотеку

@@ -102,6 +102,20 @@ public class WxRentContractController extends WxContractBaseController {
return new ResultData(page);
}
@GetMapping("getDateDiff")
@ApiImplicitParams({
@ApiImplicitParam(name = "startDate", value = "开始时间", dataType = "string", paramType = "query", required = true),
@ApiImplicitParam(name = "endtDate", value = "结束时间", dataType = "string", paramType = "query", required = true)})
@SystemControllerLog(description = "获取两个时间相差,返回n月零n天")
public ResultData getDateDiff(String startDate, String endDate) throws Exception{
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
Map<String,Integer> map = new HashMap<>();
int[] array = DateUtils.getDiff(sd.parse(startDate),sd.parse(endDate));
map.put("month",array[0]);
map.put("day",array[1]);
return new ResultData(map);
}
/**
* 新增第一步
* @param wxRentContract
@@ -385,21 +399,6 @@ public class WxRentContractController extends WxContractBaseController {
wxRentContractService.download(request,response);
}

@GetMapping("getDateDiff")
@ApiImplicitParams({
@ApiImplicitParam(name = "startDate", value = "开始时间", dataType = "string", paramType = "query", required = true),
@ApiImplicitParam(name = "endtDate", value = "结束时间", dataType = "string", paramType = "query", required = true)})
@SystemControllerLog(description = "获取两个时间相差,返回n月零n天")
public ResultData getDateDiff(String startDate, String endDate) throws Exception{
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
Map<String,Integer> map = new HashMap<>();
int[] array = DateUtils.getDiff(sd.parse(startDate),sd.parse(endDate));
map.put("month",array[0]);
map.put("day",array[1]);
return new ResultData(map);
}

@PostMapping("effective")
@ApiImplicitParams({})
@SystemControllerLog(description = "租金合同-合同生效")


+ 7
- 0
mallinkAdmin/src/main/resources/db/migration/欢乐城拆分.sql Прегледај датотеку

@@ -0,0 +1,7 @@
user_basic_info_address_28 拷贝到user_basic_info_address_8, user_basic_info_address_20
wx_c_user_basic_child_28 拷贝到wx_c_user_basic_child_8,wx_c_user_basic_child_20
wx_c_user_basic_info_28 拷贝到wx_c_user_basic_info_8,wx_c_user_basic_info_20
wx_c_user_basic_sign_28 拷贝到wx_c_user_basic_sign_8,wx_c_user_basic_sign_20
wx_c_user_tags_28 拷贝到 wx_c_user_tags_8,wx_c_user_tags_20
wx_level_config 拷贝
wx_mall更新,缓存更新

+ 12
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Прегледај датотеку

@@ -2357,10 +2357,18 @@ public class WxRentContractServiceImpl implements WxRentContractService {
@Override
public List<WxRentContractYearsVo> getRentContractYears(WxRentContract rentContract) {
String adjustRatio = rentContract.getAdjustRatio();
List<String> integers = JSONArray.parseArray(adjustRatio, String.class);
integers.add(0, "0");
int years = integers.size();
//String adjustRatio = rentContract.getAdjustRatio();
//List<String> integers = JSONArray.parseArray(adjustRatio, String.class);
//integers.add(0, "0");
//int years = integers.size();
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
int [] diffs = DateUtils.getDiff(rentContract.getRentalStartDate(),rentContract.getRentalEndDate());
int months = diffs[0];
int ext = months % 12;
int years = months/12;
if (ext > 0 ) {
years = years + 1;
}
//合同以什么日期来计算开始计租日期
if(rentContract.getRentStartType()!=null &&rentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
rentContract.setRentalStartDate(rentContract.getStartDate());


Loading…
Откажи
Сачувај