Merge branch 'V0.0.1' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.1

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysOrg.java

@@ -84,6 +84,7 @@ public class SysOrg extends BaseEntity {
 
     @ApiModelProperty(value = "机构类型")
     @TableField(value = "type")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Integer type;
 
     @ApiModelProperty(value = "路径")
@@ -107,7 +108,10 @@ public class SysOrg extends BaseEntity {
     @ApiModelProperty(value = "机构来源, 0:系统新增 1:fjnx同步")
     @TableField(value = "source")
     private Integer source;
-
+    @ApiModelProperty(value = "机构类型(同步)")
+    private String orgType;
+    @ApiModelProperty(value = "实际机构类型")
+    private String realityOrgType;
     /**
      * 机构简称
      */
@@ -129,7 +133,6 @@ public class SysOrg extends BaseEntity {
     private List<SysOrg> children = new ArrayList<SysOrg>();
 
 
-
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/vo/CoreEduTrainingTaskReportVo.java

@@ -1,11 +1,14 @@
 package com.xunmei.common.core.domain.edu.vo;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class CoreEduTrainingTaskReportVo {
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "教育培训计划Id")
     private Long planId;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/controller/CoreEduTrainingPlanController.java

@@ -109,7 +109,7 @@ public class CoreEduTrainingPlanController extends BaseController {
     @RequiresPermissions("core:plan:list")
     @GetMapping("/planList/{orgId}")
     public AjaxResult planList(@PathVariable("orgId") Long orgId) {
-        List<IdName<Long, String>> planList = coreEduTrainingPlanService.planList(orgId);
+        List<IdName<String, String>> planList = coreEduTrainingPlanService.planList(orgId);
         return AjaxResult.success(planList);
     }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/mapper/CoreEduTrainingPlanMapper.java

@@ -73,7 +73,7 @@ public interface CoreEduTrainingPlanMapper extends BaseMapper<CoreEduTrainingPla
 
     CoreEduTrainingPlanDataVo getDetailPlanData(@Param("id") Long id);
 
-    List<IdName<Long, String>> planList(@Param("path") String path);
+    List<IdName<String, String>> planList(@Param("path") String path);
 
     List<CoreEduTrainingPlanPageVo> selectChildrenPlan(@Param("request") CoreEduTrainingPlanPageDto request);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/ICoreEduTrainingPlanService.java

@@ -91,5 +91,5 @@ public interface ICoreEduTrainingPlanService extends IService<CoreEduTrainingPla
      */
     List<SysOrg> getExecuteOrg(CoreEduTrainingPlan plan);
 
-    List<IdName<Long, String>> planList(Long orgId);
+    List<IdName<String, String>> planList(Long orgId);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingPlanServiceImpl.java

@@ -23,9 +23,7 @@ import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanDetailVo;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanPageVo;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanRoleVo;
 import com.xunmei.common.core.exception.SystemException;
-import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.utils.DateUtils;
-import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.edu.mapper.CoreEduTrainingPlanMapper;
@@ -36,7 +34,6 @@ import com.xunmei.core.edu.service.ICoreEduTrainingPlanService;
 import com.xunmei.core.edu.service.ICoreEduTrainingPlanToExecOrgService;
 import com.xunmei.core.edu.service.ICoreEduTrainingPlanToRoleService;
 import com.xunmei.core.edu.service.ICoreEduTrainingTaskService;
-import com.xunmei.system.api.Eto.RoleConditionEto;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.RemoteRoleService;
 import com.xunmei.system.api.domain.SysOrg;
@@ -429,7 +426,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
     }
 
     @Override
-    public List<IdName<Long, String>> planList(Long orgId) {
+    public List<IdName<String, String>> planList(Long orgId) {
         SysOrg org = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgById(orgId, SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         return coreEduTrainingPlanMapper.planList(org.getPath());
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysOrgExtend.java

@@ -157,6 +157,7 @@ public class SysOrgExtend extends BaseEntity {
      * 机构id
      */
     @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
     @ApiModelProperty(value = "建设时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgExtendServiceImpl.java

@@ -151,6 +151,7 @@ public class SysOrgExtendServiceImpl extends ServiceImpl<SysOrgExtendMapper, Sys
         if (sysOrgExtend.getConstructionList() != null && sysOrgExtend.getConstructionList().size() > 0) {
             for (SysPhysicalDefenseConstruction s :
                     sysOrgExtend.getConstructionList()) {
+                s.setId(null);
 //                if (s.getOrgId() == null) {
                     s.setOrgId(org.getId());
                     s.setCreateTime(DateUtils.getNowDate());