소스 검색

添加计划为空任务存在的提交产生问题进行 null判断

高雄 1 년 전
부모
커밋
d5d161a372
1개의 변경된 파일4개의 추가작업 그리고 1개의 파일을 삭제
  1. 4 1
      soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/gx/service/ResumptionServiceImpl.java

+ 4 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/gx/service/ResumptionServiceImpl.java

@@ -182,6 +182,7 @@ public class ResumptionServiceImpl implements ResumptionService {
                         throw new ServiceException("整改期限为空或不是有效的数值");
                     }
                     SysOrg org = remoteOrgService.selectSysOrgById(sysResumption.getOrgId(), SecurityConstants.INNER);
+
                     Question question = Question.builder()
                             .srcTaskId(taskId)
                             .orgId(org.getId())
@@ -190,7 +191,6 @@ public class ResumptionServiceImpl implements ResumptionService {
                             .SrcPointId(point.getPointId())
                             .srcDataPointId(pointId)
                             .srcType(QuestionSrcType.Resumption.getValue())
-                            .srcTaskType(appPlan.getPlanType())
                             .srcTaskName(sysResumption.getName())
                             .checkItem(check.getItemName())
                             .checkContent(point.getPointName())
@@ -200,6 +200,9 @@ public class ResumptionServiceImpl implements ResumptionService {
                             .submitTime(ObjectUtil.isNull(data.getSubmitTime()) ? new Date() : data.getSubmitTime())
                             .reformDeadline(DateUtil.endOfDay(DateUtil.offsetDay(new Date(), Integer.parseInt(point.getRectificationDeadline()))))
                             .build();
+                    if(appPlan != null){
+                        question.setSrcTaskType(appPlan.getPlanType());
+                    }
                     IdWorker.getId(question);
                     if (ObjectUtil.equal(question.getOrgId(), SecurityUtils.getLoginUser().getOrgId())) {
                         question.setConfirmStatus(QuestionConfirmEnum.Confirmed.getValue());