质量问题相关bug

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/QualityProblemController.java

@@ -216,6 +216,7 @@ public class QualityProblemController extends BaseController {
 		BeanUtils.copyProperties(qualityProblemDto, qualityProblem, "systemContactSheet", "submission");
 		qualityProblem.setSystemContactSheet(JSON.toJSONString(qualityProblemDto.getSystemContactSheet()));
 		qualityProblem.setSubmission(JSON.toJSONString(qualityProblemDto.getSubmission()));
+		qualityProblem.setReformDoc(JSON.toJSONString(qualityProblemDto.getReformDocList()));
 		return ResponseHelper.buildResponse(problemInitiationService.manualProcessingStart(qualityProblem, status, type));
 	}
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/QualityProblemServiceImpl.java

@@ -219,6 +219,16 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
         qualityProblemDto.setReviewStatusString(String.valueOf(qualityProblemDto.getReviewStatus()));
         qualityProblemDto.setSystemContactSheet(JSON.parseArray(qualityProblemDto.getSystemContactSheetString()));
         qualityProblemDto.setSubmission(JSON.parseArray(qualityProblemDto.getSubmissionString()));
+        //是否限期整改
+        ZoneId zoneId = ZoneId.systemDefault();
+        LocalDateTime now = LocalDateTime.now();
+        if (ValidationUtil.isEmpty(qualityProblemDto.getRectifyWithinTime()) && !ValidationUtil.isEmpty(qualityProblemDto.getReformLimitDate())) {
+            LocalDateTime localDateTime = LocalDateTime.ofInstant(qualityProblemDto.getReformLimitDate().toInstant(), zoneId);
+            if (now.isAfter(localDateTime)) {
+                qualityProblemDto.setRectifyWithinTime(Boolean.FALSE);
+            }
+        }
+        qualityProblemDto.setRectifyWithingName(Boolean.TRUE.equals(qualityProblemDto.getRectifyWithinTime()) ? "超期" : "正常");
         return qualityProblemDto;
     }