ly преди 1 година
родител
ревизия
cf848b334c

+ 2 - 2
src/main/java/cn/ezhizao/project/business/order/controller/BizArchiveInputController.java

@@ -403,14 +403,14 @@ public class BizArchiveInputController extends BaseController {
                     Long workOrderId = one.getWorkOrderId();
                     List<BizWorkOrderRecord> list = workOrderRecordService.list(new LambdaQueryWrapper<BizWorkOrderRecord>()
                             .eq(BizWorkOrderRecord::getWorkOrderId, workOrderId));
+
+                    //续签时当前时间段如果没有工单则可以修改
                     DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
                     SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
                     List<LocalDate> datesList = list.stream().map(x -> {
                         String formattedMonth = String.format("%02d", Integer.valueOf(x.getMonth()).intValue());
                         return LocalDate.parse(x.getYear() + "-" +formattedMonth+"-01", formatter);
                     }).collect(Collectors.toList());
-
-                    //续签时当前时间段如果没有工单则可以修改
                     TimeVo time = getTime(item.getContractId(), item.getId(), item.getTaskTypeId(), newBizArchiveInput.getCompanyId());
                     if (time != null) {
                         String startM = format.format(time.getStartTime());

+ 1 - 1
src/main/java/cn/ezhizao/project/business/workOrder/controller/BizWorkOrderController.java

@@ -232,7 +232,7 @@ public class BizWorkOrderController extends BaseController {
                                     monthNum = monthNum + detail.getServiceNum() + detail.getFreeNum();
                                 }
                                 //判断收款月数是否等于服务月数
-                                if (detail.getServiceNum() == monthNum) {
+                                if (detail!= null && detail.getServiceNum() == monthNum) {
                                     //如果服务月数等于收款月数则加上赠送月数
                                     monthNum += detail.getFreeNum();
                                 }