|
|
@@ -245,7 +245,11 @@ public class HlwOrderServiceImpl extends ServiceImpl<HlwOrderMapper, HlwOrder> i
|
|
|
String workContract = jsonObjectNew.getString("workContract");
|
|
|
Date startDate = jsonObjectNew.getDate("startDate");
|
|
|
Integer isAutoRenew = jsonObjectNew.getInteger("isAutoRenew");
|
|
|
- Date endDate = jsonObject.getDate("endDate");
|
|
|
+ Date endDate = new Date();
|
|
|
+ if (isAutoRenew == 1) {
|
|
|
+ LocalDate autoDate = LocalDate.parse("2100-01-01", DateTimeFormatter.ofPattern("yyyy-MM-dd"));
|
|
|
+ endDate = DateUtils.asDate(autoDate);
|
|
|
+ }
|
|
|
//查询user_id、subcontractorId的订单(hlw_user_subcontractor)
|
|
|
HlwUser hlwUser = hlwUserService.getByUserCode(userCode);
|
|
|
QueryWrapper<HlwUserSubcontractor> queryWrapper = new QueryWrapper<>();
|