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

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

@@ -59,6 +59,10 @@ public class SysLearningMaterials extends BaseEntity {
     @ApiModelProperty(value = "附件")
     private String fileList;
 
+    @TableField(value = "file_names",updateStrategy = FieldStrategy.IGNORED)
+    @ApiModelProperty(value = "附件名称")
+    private String fileNames;
+
     @TableField(value = "remark")
     @ApiModelProperty(value = "备注")
     private String remark;

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

@@ -55,6 +55,8 @@ public class SysLearningMaterialsPageVo {
     @ApiModelProperty(value = "附件")
     private String fileList;
 
+    private String fileNames;
+
     @ApiModelProperty(value = "备注")
     private String remark;
 }

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

@@ -131,6 +131,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         final CoreEduTrainingPlan plan = coreEduTrainingPlanMapper.selectById(id);
         CoreEduTrainingPlanDetailVo vo = new CoreEduTrainingPlanDetailVo();
         BeanUtils.copyProperties(plan, vo);
+        vo.setBuildTaskNow(ObjectUtil.equal(1,plan.getBuildTaskNow()));
         vo.setFileList(ObjectUtil.isNotEmpty(plan.getFileList()) ? JSON.parseArray(plan.getFileList(), String.class) : null);
         final List<CoreEduTrainingPlanToExecOrg> execOrgList = coreEduTrainingPlanToExecOrgMapper.selectByMap(MapUtil.of("plan_id", id));
         final List<Long> execOrgIdList = execOrgList.stream().map(CoreEduTrainingPlanToExecOrg::getOrgId).collect(Collectors.toList());
@@ -185,10 +186,10 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         SysOrg r = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgById(orgId, SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         SysOrg org = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.getSysOrgByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         plan.setCreateOrgId(orgId);
-        plan.setCreateOrgName(r.getName());
+        plan.setCreateOrgName(r.getShortName());
         plan.setCreateOrgPath(r.getPath());
         plan.setBelongOrgId(orgId);
-        plan.setBelongOrgName(r.getName());
+        plan.setBelongOrgName(r.getShortName());
         plan.setBelongOrgPath(r.getPath());
         plan.setFileList(ObjectUtil.isNotEmpty(request.getFileList()) ? JSON.toJSONString(request.getFileList()) : null);
         batchSavePlanToRole(request.getPlanRoleId(), plan.getId());
@@ -676,7 +677,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
             BeanUtils.copyProperties(plan, coreEduTrainingPlan);
             coreEduTrainingPlan.setId(IdWorker.getId());
             coreEduTrainingPlan.setBelongOrgId(sysOrg.getId());
-            coreEduTrainingPlan.setBelongOrgName(sysOrg.getName());
+            coreEduTrainingPlan.setBelongOrgName(sysOrg.getShortName());
             coreEduTrainingPlan.setBelongOrgPath(sysOrg.getPath());
             coreEduTrainingPlan.setStandard(0);
             coreEduTrainingPlan.setIssue(0);

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

@@ -329,7 +329,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
                 trainingTask.setImageList(null);
                 trainingTask.setOrgId(org.getId());
                 trainingTask.setType(null);
-                trainingTask.setOrgName(org.getName());
+                trainingTask.setOrgName(org.getShortName());
                 trainingTask.setOrgPath(org.getPath());
                 trainingTask.setStatus(EduTrainingDoStatus.WAIT_RECORDED.getCode());
                 trainingTask.setPdfUrl(null);

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

@@ -72,7 +72,6 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
         }
         for (SysLearningMaterialsPageVo record : page.getRecords()) {
             record.setNo(page.getRecords().indexOf(record));
-            extractStringFromUrl(record);
         }
        return TableDataInfo.success(page);
     }
@@ -152,11 +151,23 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
         sysLearningMaterials.setCreateTime(DateUtils.getNowDate());
         sysLearningMaterials.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
         sysLearningMaterials.setUpdateTime(DateUtils.getNowDate());
-        sysLearningMaterials.setFileList(ObjectUtil.isNotEmpty(request.getFileList()) ? JSON.toJSONString(request.getFileList()) : null);
+        sysLearningMaterials.setFileList(null);
+        sysLearningMaterials.setFileNames(null);
+        if (ObjectUtil.isNotEmpty(request.getFileList()) ){
+            sysLearningMaterials.setFileList(JSON.toJSONString(request.getFileList()));
+            ArrayList<String> list1 = new ArrayList<>();
+            request.getFileList().forEach(file -> {
+                final Map map = JSON.parseObject(file, Map.class);
+                if (ObjectUtil.isNotEmpty(map.get("name"))) {
+                    list1.add(map.get("name").toString());
+                }
+            });
+            sysLearningMaterials.setFileNames(String.join(",", list1));
+        }
         sysLearningMaterials.setIsOpen(0);
         SysOrg sysOrg = remoteOrgService.selectSysOrgById(sysLearningMaterials.getOrgId(), SecurityConstants.INNER);
         if (sysOrg != null) {
-            sysLearningMaterials.setOrgName(sysOrg.getName());
+            sysLearningMaterials.setOrgName(sysOrg.getShortName());
             sysLearningMaterials.setOrgPath(sysOrg.getPath());
         }
         return sysLearningMaterialsMapper.insert(sysLearningMaterials);
@@ -170,12 +181,24 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
      */
     @Override
     public int updateSysLearningMaterials(SysLearningMaterialsUpdateDto request) {
-        final SysLearningMaterials materials = getById(request.getId());
-        BeanUtils.copyProperties(request, materials);
-        materials.setFileList(ObjectUtil.isNotEmpty(request.getFileList()) ? JSON.toJSONString(request.getFileList()) : null);
-        materials.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
-        materials.setUpdateTime(DateUtils.getNowDate());
-        return sysLearningMaterialsMapper.updateById(materials);
+        final SysLearningMaterials sysLearningMaterials = getById(request.getId());
+        BeanUtils.copyProperties(request, sysLearningMaterials);
+        sysLearningMaterials.setFileList(null);
+        sysLearningMaterials.setFileNames(null);
+        if (ObjectUtil.isNotEmpty(request.getFileList()) ){
+            sysLearningMaterials.setFileList(JSON.toJSONString(request.getFileList()));
+            ArrayList<String> list1 = new ArrayList<>();
+            request.getFileList().forEach(file -> {
+                final Map map = JSON.parseObject(file, Map.class);
+                if (ObjectUtil.isNotEmpty(map.get("name"))) {
+                    list1.add(map.get("name").toString());
+                }
+            });
+            sysLearningMaterials.setFileNames(String.join(",", list1));
+        }
+        sysLearningMaterials.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
+        sysLearningMaterials.setUpdateTime(DateUtils.getNowDate());
+        return sysLearningMaterialsMapper.updateById(sysLearningMaterials);
     }
 
     /**

soc-modules/soc-modules-core/src/main/resources/mapper/edu/SysLearningMaterialsMapper.xml

@@ -106,7 +106,8 @@
         u.name as create_by,
         u.id as createId,
         m.create_time,
-        m.update_time as updateTime
+        m.update_time as updateTime,
+        m.file_names as  fileNames
         from sys_learning_materials m
         inner join sys_knowledge k on m.knowledge_id = k.id
         inner join sys_user u on u.id=m.create_by
@@ -147,7 +148,8 @@
         u.name as create_by,
         u.id as createId,
         m.create_time,
-        m.update_time as updateTime
+        m.update_time as updateTime,
+        m.file_names as  fileNames
         from sys_learning_materials m
         inner join sys_knowledge k on m.knowledge_id = k.id
         inner join sys_user u on u.id=m.create_by
@@ -318,7 +320,7 @@
             and m.title like concat('%', #{request.title}, '%')
         </if>
         <if test="request.fileName != null and request.fileName != '' ">
-            and m.file_list like concat('%', #{request.fileName}, '%')
+            and m.file_names like concat('%', #{request.fileName}, '%')
         </if>
         <if test="request.orgIdList.size>0">
             and m.org_id in