检查任务详情的被检查机构名称可能是全称问题

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

@@ -284,7 +284,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
             taskImgs = imgs.stream().collect(Collectors.groupingBy(CoreSafetyTaskDataRemarkimg::getTaskDataId));
         }
 
-        TaskRegisterVo<AppTaskRegisterPointVo> vo = TaskRegisterVo.of(task, beCheckedOrg.getType().toString(), roleNames, getInRegisterTime(task.getPlanStartTime(), task.getPlanEndTime()));
+        TaskRegisterVo<AppTaskRegisterPointVo> vo = TaskRegisterVo.of(task, beCheckedOrg, roleNames, getInRegisterTime(task.getPlanStartTime(), task.getPlanEndTime()));
         if (ObjectUtil.isNotNull(plan)) {
             vo.setPlanType(plan.getCheckType().intValue());
         }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/regsiter/TaskRegisterVo.java

@@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.core.safetyCheck.domain.CoreSafetyTask;
+import com.xunmei.system.api.domain.SysOrg;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
 import lombok.Data;
@@ -92,7 +93,7 @@ public class TaskRegisterVo<T> {
     @ApiModelProperty(value = "检查列表")
     private List<T> checkList;
 
-    public static TaskRegisterVo of(CoreSafetyTask task, String beCheckOrgType, List<IdNameVo> checkRoles,int inRegisterTime) {
+    public static TaskRegisterVo of(CoreSafetyTask task, SysOrg beCheckedOrg, List<IdNameVo> checkRoles, int inRegisterTime) {
         TaskRegisterVo vo = new TaskRegisterVo();
         vo.setId(task.getId());
         vo.setTaskName(task.getTitle());
@@ -104,8 +105,8 @@ public class TaskRegisterVo<T> {
         vo.setCheckOrgId(task.getCheckOrgId());
         vo.setCheckOrgName(task.getCheckOrgName());
         vo.setBeCheckedOrgId(task.getOrgId());
-        vo.setBeCheckedOrgName(task.getOrgName());
-        vo.setBeCheckOrgType(beCheckOrgType);
+        vo.setBeCheckedOrgName(beCheckedOrg.getShortName());
+        vo.setBeCheckOrgType(beCheckedOrg.getType().toString());
         vo.setCheckTeam(task.getCheckTeam());
         vo.setCheckRoles(checkRoles);
         vo.setYmdDate(task.getYmdDate());