问题整改增加来源任务类型字段

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/domain/Question.java

@@ -61,11 +61,18 @@ public class Question extends BaseEntity {
     private Integer srcType;
 
     /**
+     * 来源任务的任务类型
+     */
+    private Integer srcTaskType;
+
+    /**
      * 来源任务id
      */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long srcTaskId;
 
+
+
     /**
      * 来源任务名称
      */

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

@@ -103,7 +103,7 @@ public class ResumptionServiceImpl implements ResumptionService {
         if (status == 1 || status == 4) {
             //待履职 和已过期的数据是没有保存过数据的只能根据计划获取
             Long planId = resumption.getPlanId();
-            resumptionPlanVos = appPlanMapper.selectResumptionPlan(planId,resumption.getPlanStartTime());
+            resumptionPlanVos = appPlanMapper.selectResumptionPlan(planId, resumption.getPlanStartTime());
             isExist = false;
         } else {
             resumptionPlanVos = resumptionMapper.selectResumptionPlan(taskDetailVo.getTaskId());
@@ -131,7 +131,7 @@ public class ResumptionServiceImpl implements ResumptionService {
         int quarter = dateTime.getQuarter();
         //获取履职任务
         Resumption sysResumption = resumptionMapper.findOneByTaskIdAndDate(taskId, year, quarter);
-
+        AppPlan appPlan = appPlanMapper.selectById(sysResumption.getPlanId());
         sysResumption.setUpdateBy(SecurityUtils.getUsername());
         sysResumption.setSubmitorId(SecurityUtils.getUserId());
         sysResumption.setSubmitorName(SecurityUtils.getLoginUser().getName());
@@ -191,6 +191,7 @@ public class ResumptionServiceImpl implements ResumptionService {
                             .SrcPointId(point.getPointId())
                             .srcDataPointId(data.getId())
                             .srcType(QuestionSrcType.Resumption.getValue())
+                            .srcTaskType(appPlan.getPlanType())
                             .srcTaskName(sysResumption.getName())
                             .checkItem(check.getItemName())
                             .checkContent(point.getPointName())
@@ -240,7 +241,7 @@ public class ResumptionServiceImpl implements ResumptionService {
 //            TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
 //                @Override
 //                public void afterCommit() {
-                    appPlanService.updatePlanCompletedState(sysResumption.getPlanId(),1);
+            appPlanService.updatePlanCompletedState(sysResumption.getPlanId(), 1);
 //                }
 //            });
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRegisterSericeImpl.java

@@ -509,6 +509,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
                 .SrcPointId(point.getPointId())
                 .srcDataPointId(point.getId())
                 .srcType(QuestionSrcType.SafetyCheck.getValue())
+                .srcTaskType(task.getPlanType())
                 .srcTaskName(task.getTaskName())
                 .checkItem(pointVo.getItemName())
                 .checkContent(pointVo.getPointName())