Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/common/enums/MaterialCategoryEnum.java

@@ -0,0 +1,42 @@
+package com.xjrsoft.common.enums;
+
+/**
+ * @author dzx
+ * @date 2023/12/1
+ * 学籍状态
+ */
+public enum MaterialCategoryEnum {
+
+    /**
+     * 在读
+     * */
+    MT0001("MT0001", "附件"),
+    /**
+     * 休学
+     * */
+    MT0002("MT0002", "表单");
+    final String code;
+    final String value;
+
+    public String getCode() {
+        return this.code;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public static String getValue(String code) {
+        for (MaterialCategoryEnum item : values()) {
+            if (item.getCode().equals(code)) {
+                return  item.getValue();
+            }
+        }
+        return null;
+    }
+
+    MaterialCategoryEnum(final String code, final String message) {
+        this.code = code;
+        this.value = message;
+    }
+}

src/main/java/com/xjrsoft/module/material/controller/MaterialTypeController.java

@@ -8,14 +8,18 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.annotation.XjrLog;
+import com.xjrsoft.common.enums.MaterialCategoryEnum;
 import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.app.dto.UpdateEnableMarkDto;
+import com.xjrsoft.module.form.entity.FormTemplate;
+import com.xjrsoft.module.form.service.IFormTemplateService;
 import com.xjrsoft.module.material.dto.AddMaterialTypeAssignDto;
 import com.xjrsoft.module.material.dto.AddMaterialTypeDto;
 import com.xjrsoft.module.material.dto.MaterialTypeAssignPageDto;
@@ -30,6 +34,8 @@ import com.xjrsoft.module.material.vo.MaterialTypePageVo;
 import com.xjrsoft.module.material.vo.MaterialTypeVo;
 import com.xjrsoft.module.organization.entity.Department;
 import com.xjrsoft.module.organization.entity.UserDeptRelation;
+import com.xjrsoft.module.system.entity.File;
+import com.xjrsoft.module.system.service.IFileService;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -72,13 +78,7 @@ public class MaterialTypeController {
     @ApiOperation(value="材料提交任务类型列表(分页)")
     @SaCheckPermission("materialtype:detail")
     public RT<PageOutput<MaterialTypePageVo>> page(@Valid MaterialTypePageDto dto){
-
-        LambdaQueryWrapper<MaterialType> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
-                    .orderByDesc(MaterialType::getId)
-                .select(MaterialType.class,x -> VoToColumnUtil.fieldsToColumns(MaterialTypePageVo.class).contains(x.getProperty()));
-        IPage<MaterialType> page = materialTypeService.page(ConventPage.getPage(dto), queryWrapper);
-        PageOutput<MaterialTypePageVo> pageOutput = ConventPage.getPageOutput(page, MaterialTypePageVo.class);
+        PageOutput<MaterialTypePageVo> pageOutput = materialTypeService.getPage(dto);
         return RT.ok(pageOutput);
     }
 
@@ -101,11 +101,11 @@ public class MaterialTypeController {
     @ApiOperation(value="根据id查询材料提交任务类型信息")
     @SaCheckPermission("materialtype:detail")
     public RT<MaterialTypeVo> info(@RequestParam Long id){
-        MaterialType materialType = materialTypeService.getByIdDeep(id);
-        if (materialType == null) {
+        MaterialTypeVo materialTypeVo = materialTypeService.getInfoById(id);
+        if (materialTypeVo == null) {
            return RT.error("找不到此数据！");
         }
-        return RT.ok(BeanUtil.toBean(materialType, MaterialTypeVo.class));
+        return RT.ok(materialTypeVo);
     }
 
 

src/main/java/com/xjrsoft/module/material/dto/AddMaterialTypeDto.java

@@ -1,10 +1,11 @@
 package com.xjrsoft.module.material.dto;
 
+import com.xjrsoft.module.system.entity.File;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-
+import java.util.List;
 
 
 /**
@@ -23,11 +24,19 @@ public class AddMaterialTypeDto implements Serializable {
     */
     @ApiModelProperty("任务名称")
     private String name;
-
     /**
-     * 有效标志
+     * 任务类型(可多选 xjr_dictionary_detail[material_category])
      */
-    @ApiModelProperty("有效标志")
-    private Integer enabledMark;
-
+    @ApiModelProperty("任务类型(可多选 xjr_dictionary_detail[material_category])")
+    private String materialCategory;
+    /**
+     * 文件模板
+     */
+    @ApiModelProperty("文件模板")
+    private Long folderId;
+    /**
+     * 表单发布
+     */
+    @ApiModelProperty("表单发布")
+    private Long formReleaseId;
 }

src/main/java/com/xjrsoft/module/material/dto/MaterialTypePageDto.java

@@ -1,6 +1,9 @@
 package com.xjrsoft.module.material.dto;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -14,6 +17,16 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class MaterialTypePageDto extends PageInput {
-
-
+    /**
+     * 任务名称
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("任务名称")
+    @ApiModelProperty("任务名称")
+    private String name;
+    /**
+     * 任务类型(可多选 xjr_dictionary_detail[material_category])
+     */
+    @ApiModelProperty("任务类型(可多选 xjr_dictionary_detail[material_category])")
+    private String materialCategory;
 }

src/main/java/com/xjrsoft/module/material/entity/MaterialType.java

@@ -77,6 +77,22 @@ public class MaterialType implements Serializable {
     @ApiModelProperty("任务名称")
     private String name;
 
+    /**
+     * 任务类型(可多选 xjr_dictionary_detail[material_category])
+     */
+    @ApiModelProperty("任务类型(可多选 xjr_dictionary_detail[material_category])")
+    private String materialCategory;
+
+    /**
+     * 文件模板
+     */
+    @ApiModelProperty("文件模板")
+    private Long folderId;
+    /**
+     * 表单发布
+     */
+    @ApiModelProperty("表单发布")
+    private Long formReleaseId;
     /**
     * materialTypeAssign
     */

src/main/java/com/xjrsoft/module/material/service/IMaterialTypeService.java

@@ -1,7 +1,11 @@
 package com.xjrsoft.module.material.service;
 
 import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.module.material.dto.MaterialTypePageDto;
 import com.xjrsoft.module.material.entity.MaterialType;
+import com.xjrsoft.module.material.vo.MaterialTypePageVo;
+import com.xjrsoft.module.material.vo.MaterialTypeVo;
 
 import java.util.List;
 
@@ -36,4 +40,8 @@ public interface IMaterialTypeService extends MPJBaseService<MaterialType> {
     * @return
     */
     Boolean delete(List<Long> ids);
+
+    PageOutput<MaterialTypePageVo> getPage(MaterialTypePageDto dto);
+
+    MaterialTypeVo getInfoById(Long id);
 }

src/main/java/com/xjrsoft/module/material/service/impl/MaterialTypeServiceImpl.java

@@ -1,12 +1,28 @@
 package com.xjrsoft.module.material.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.xjrsoft.common.enums.MaterialCategoryEnum;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.form.entity.FormRelease;
+import com.xjrsoft.module.form.entity.FormTemplate;
+import com.xjrsoft.module.form.service.IFormTemplateService;
+import com.xjrsoft.module.material.dto.MaterialTypePageDto;
 import com.xjrsoft.module.material.entity.MaterialType;
 import com.xjrsoft.module.material.entity.MaterialTypeAssign;
 import com.xjrsoft.module.material.mapper.MaterialTypeAssignMapper;
 import com.xjrsoft.module.material.mapper.MaterialTypeMapper;
 import com.xjrsoft.module.material.service.IMaterialTypeService;
+import com.xjrsoft.module.material.vo.MaterialTypePageVo;
+import com.xjrsoft.module.material.vo.MaterialTypeVo;
+import com.xjrsoft.module.system.entity.File;
+import com.xjrsoft.module.system.service.IFileService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -26,7 +42,9 @@ public class MaterialTypeServiceImpl extends MPJBaseServiceImpl<MaterialTypeMapp
 
     private final MaterialTypeAssignMapper materialTypeMaterialTypeAssignMapper;
 
+    private final IFileService fileService;
 
+    private final IFormTemplateService formTemplateService;
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean add(MaterialType materialType) {
@@ -83,4 +101,132 @@ public class MaterialTypeServiceImpl extends MPJBaseServiceImpl<MaterialTypeMapp
 
         return true;
     }
+
+    @Override
+    public PageOutput<MaterialTypePageVo> getPage(MaterialTypePageDto dto) {
+        LambdaQueryWrapper<MaterialType> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                .orderByDesc(MaterialType::getId)
+                .select(MaterialType.class,x -> VoToColumnUtil.fieldsToColumns(MaterialTypePageVo.class).contains(x.getProperty()))
+                .like(dto.getName() != null && dto.getName().equals(""), MaterialType::getName, dto.getName())
+                .eq(dto.getMaterialCategory() != null && dto.getMaterialCategory().equals(""), MaterialType::getMaterialCategory, dto.getMaterialCategory());
+        IPage<MaterialType> page = this.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<MaterialTypePageVo> pageOutput = ConventPage.getPageOutput(page, MaterialTypePageVo.class);
+
+        for (MaterialTypePageVo materialTypePageVo : pageOutput.getList()){
+            String materialCategoryStr = materialTypePageVo.getMaterialCategory();
+            String[] materialCategoryStrArr = materialCategoryStr.split(",");
+
+            for (String category : materialCategoryStrArr) {
+                if (category != null) {
+                    String categoryValue = MaterialCategoryEnum.getValue(category);
+                    if (categoryValue != null) {
+                        if (materialTypePageVo.getMaterialCategoryCn() != null && materialTypePageVo.getMaterialCategoryCn().length() > 0) {
+                            materialTypePageVo.setMaterialCategoryCn(materialTypePageVo.getMaterialCategoryCn() + "，" + categoryValue);
+                        } else {
+                            materialTypePageVo.setMaterialCategoryCn(categoryValue);
+                        }
+                        handleFileAndTemplate(materialTypePageVo, category);
+                    }
+                }
+            }
+        }
+        return pageOutput;
+    }
+
+    @Override
+    public MaterialTypeVo getInfoById(Long id) {
+        LambdaQueryWrapper<MaterialType> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                .orderByDesc(MaterialType::getId)
+                .select(MaterialType.class,x -> VoToColumnUtil.fieldsToColumns(MaterialTypeVo.class).contains(x.getProperty()))
+                .eq(MaterialType::getId, id);
+        MaterialType materialType = this.getOne(queryWrapper);
+
+        MaterialTypeVo materialTypeVo = BeanUtil.toBean(materialType, MaterialTypeVo.class);
+
+        String materialCategoryStr = materialTypeVo.getMaterialCategory();
+        String[] materialCategoryStrArr = materialCategoryStr.split(",");
+
+        for (String category : materialCategoryStrArr) {
+            if (category != null) {
+                String categoryValue = MaterialCategoryEnum.getValue(category);
+                if (categoryValue != null) {
+                    if (materialTypeVo.getMaterialCategoryCn() != null && materialTypeVo.getMaterialCategoryCn().length() > 0) {
+                        materialTypeVo.setMaterialCategoryCn(materialTypeVo.getMaterialCategoryCn() + "，" + categoryValue);
+                    } else {
+                        materialTypeVo.setMaterialCategoryCn(categoryValue);
+                    }
+
+                    if (MaterialCategoryEnum.MT0001.getCode().equals(category) && materialTypeVo.getFolderId() != null) {
+                        List<File> files = getFileListByFolderId(materialTypeVo.getFolderId());
+                        if (!files.isEmpty()) {
+                            materialTypeVo.setFiles(files);
+                            materialTypeVo.setFolderIdCn(files.get(0).getFileName());
+                            if (materialTypeVo.getTemplatePreview() != null && materialTypeVo.getTemplatePreview().length() > 0) {
+                                materialTypeVo.setTemplatePreview(materialTypeVo.getTemplatePreview() + "，" + files.get(0).getFileName());
+                            } else {
+                                materialTypeVo.setTemplatePreview(files.get(0).getFileName());
+                            }
+                        }
+                    } else if (MaterialCategoryEnum.MT0002.getCode().equals(category) && materialTypeVo.getFormReleaseId() != null) {
+                        FormTemplate formTemplate = getFormTemplateById(materialTypeVo.getFormReleaseId());
+                        if (formTemplate != null) {
+                            String templateName = formTemplate.getName();
+                            materialTypeVo.setFormReleaseIdCn(templateName);
+                            if (materialTypeVo.getTemplatePreview() != null && materialTypeVo.getTemplatePreview().length() > 0) {
+                                materialTypeVo.setTemplatePreview(materialTypeVo.getTemplatePreview() + "，" + templateName);
+                            } else {
+                                materialTypeVo.setTemplatePreview(templateName);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return materialTypeVo;
+    }
+
+    private void handleFileAndTemplate(MaterialTypePageVo materialTypePageVo, String category) {
+        if (MaterialCategoryEnum.MT0001.getCode().equals(category) && materialTypePageVo.getFolderId() != null) {
+            List<File> files = getFileListByFolderId(materialTypePageVo.getFolderId());
+            if (!files.isEmpty()) {
+                materialTypePageVo.setFiles(files);
+                materialTypePageVo.setFolderIdCn(files.get(0).getFileName());
+                if (materialTypePageVo.getTemplatePreview() != null && materialTypePageVo.getTemplatePreview().length() > 0) {
+                    materialTypePageVo.setTemplatePreview(materialTypePageVo.getTemplatePreview() + "，" + files.get(0).getFileName());
+                } else {
+                    materialTypePageVo.setTemplatePreview(files.get(0).getFileName());
+                }
+            }
+        } else if (MaterialCategoryEnum.MT0002.getCode().equals(category) && materialTypePageVo.getFormReleaseId() != null) {
+            FormTemplate formTemplate = getFormTemplateById(materialTypePageVo.getFormReleaseId());
+            if (formTemplate != null) {
+                String templateName = formTemplate.getName();
+                materialTypePageVo.setFormReleaseIdCn(templateName);
+                if (materialTypePageVo.getTemplatePreview() != null && materialTypePageVo.getTemplatePreview().length() > 0) {
+                    materialTypePageVo.setTemplatePreview(materialTypePageVo.getTemplatePreview() + "，" + templateName);
+                } else {
+                    materialTypePageVo.setTemplatePreview(templateName);
+                }
+            }
+        }
+    }
+
+    private List<File> getFileListByFolderId(Long folderId) {
+        return fileService.list(Wrappers.<File>query().lambda().eq(File::getFolderId, folderId));
+    }
+
+    private FormTemplate getFormTemplateById(Long formReleaseId) {
+        MPJLambdaWrapper<FormTemplate> formTemplateLambdaQueryWrapper = new MPJLambdaWrapper<>();
+        formTemplateLambdaQueryWrapper
+                .disableSubLogicDel()
+                .disableLogicDel()
+                .orderByDesc(FormTemplate::getSortCode)
+                .select(FormTemplate.class, x -> VoToColumnUtil.fieldsToColumns(FormTemplate.class).contains(x.getProperty()))
+                .leftJoin(FormRelease.class, FormRelease::getFormId, FormTemplate::getId)
+                .eq(FormRelease::getId, formReleaseId);
+        return formTemplateService.getOne(formTemplateLambdaQueryWrapper);
+    }
 }

src/main/java/com/xjrsoft/module/material/vo/MaterialTypePageVo.java

@@ -2,10 +2,12 @@ package com.xjrsoft.module.material.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.xjrsoft.module.system.entity.File;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
 * @title: 材料提交任务类型分页列表出参
@@ -24,34 +26,6 @@ public class MaterialTypePageVo {
     @ApiModelProperty("主键编号")
     private String id;
     /**
-    * 创建人
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("创建人")
-    @ApiModelProperty("创建人")
-    private Long createUserId;
-    /**
-    * 创建时间
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("创建时间")
-    @ApiModelProperty("创建时间")
-    private LocalDateTime createDate;
-    /**
-    * 修改人
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("修改人")
-    @ApiModelProperty("修改人")
-    private Long modifyUserId;
-    /**
-    * 修改时间
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("修改时间")
-    @ApiModelProperty("修改时间")
-    private LocalDateTime modifyDate;
-    /**
     * 删除标记
     */
     @ContentStyle(dataFormat = 49)
@@ -72,5 +46,46 @@ public class MaterialTypePageVo {
     @ExcelProperty("任务名称")
     @ApiModelProperty("任务名称")
     private String name;
+    /**
+     * 任务类型(可多选 xjr_dictionary_detail[material_category])
+     */
+    @ApiModelProperty("任务类型(可多选 xjr_dictionary_detail[material_category])")
+    private String materialCategory;
+    /**
+     * 任务类型(可多选 xjr_dictionary_detail[material_category])
+     */
+    @ApiModelProperty("任务类型(可多选 xjr_dictionary_detail[material_category])")
+    private String materialCategoryCn;
+    /**
+     * 文件模板
+     */
+    @ApiModelProperty("文件模板")
+    private Long folderId;
+    /**
+     * 文件模板
+     */
+    @ApiModelProperty("文件模板")
+    private String folderIdCn;
+    /**
+     * 文件模板
+     */
+    @ApiModelProperty("文件模板")
+    private List<File> files;
+    /**
+     * 表单发布
+     */
+    @ApiModelProperty("表单发布")
+    private Long formReleaseId;
+    /**
+     * 表单发布
+     */
+    @ApiModelProperty("表单发布")
+    private String formReleaseIdCn;
+
+    /**
+     * 模板预览
+     */
+    @ApiModelProperty("模板预览")
+    private String templatePreview;
 
 }

src/main/java/com/xjrsoft/module/material/vo/MaterialTypeVo.java

@@ -1,5 +1,8 @@
 package com.xjrsoft.module.material.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.xjrsoft.module.system.entity.File;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -24,12 +27,48 @@ public class MaterialTypeVo {
     */
     @ApiModelProperty("任务名称")
     private String name;
+    /**
+     * 任务类型(可多选 xjr_dictionary_detail[material_category])
+     */
+    @ApiModelProperty("任务类型(可多选 xjr_dictionary_detail[material_category])")
+    private String materialCategory;
 
+    /**
+     * 任务类型(可多选 xjr_dictionary_detail[material_category])
+     */
+    @ApiModelProperty("任务类型(可多选 xjr_dictionary_detail[material_category])")
+    private String materialCategoryCn;
 
     /**
-    * materialTypeAssign
-    */
-    @ApiModelProperty("materialTypeAssign子表")
-    private List<MaterialTypeAssignVo> materialTypeAssignList;
+     * 文件模板
+     */
+    @ApiModelProperty("文件模板")
+    private Long folderId;
+    /**
+     * 文件模板
+     */
+    @ApiModelProperty("文件模板")
+    private String folderIdCn;
+    /**
+     * 文件模板
+     */
+    @ApiModelProperty("文件模板")
+    private List<File> files;
+    /**
+     * 表单发布
+     */
+    @ApiModelProperty("表单发布")
+    private Long formReleaseId;
+    /**
+     * 表单发布
+     */
+    @ApiModelProperty("表单发布")
+    private String formReleaseIdCn;
+
+    /**
+     * 模板预览
+     */
+    @ApiModelProperty("模板预览")
+    private String templatePreview;
 
 }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentInfoDetailVo.java

@@ -96,4 +96,16 @@ public class BaseStudentInfoDetailVo {
     private String nation;
 
     private String majorSetName;
+
+    /**
+     * 性别
+     */
+    @ApiModelProperty("性别")
+    private String gender;
+
+    /**
+     * 性别中文
+     */
+    @ApiModelProperty("性别中文")
+    private String genderCn;
 }

src/main/resources/mapper/student/BaseStudentSchoolRollMapper.xml

@@ -46,6 +46,8 @@
         SELECT t2.id,
                t2.name                                                                                                       AS student_name,
                t2.mobile                                                                                                       AS phone,
+               t2.gender,
+               t11.name                                                                                                        AS genderCn,
                t1.student_id,
                t5.name                                                                                                       AS teacher_name,
                t5.mobile                                                                                                     AS teacher_phone,
@@ -76,6 +78,7 @@
                  LEFT JOIN xjr_dictionary_detail t8 ON t8.code = t3.archives_status AND t8.item_id = 2023000000000000029
                  LEFT JOIN xjr_dictionary_detail t9 ON t9.code = t3.roll_modality AND t9.item_id = 1762024751192084482
                  LEFT JOIN base_major_set t10 ON t3.major_set_id = t10.id
+                 LEFT JOIN xjr_dictionary_detail t11 ON t11.code = t2.gender
         WHERE t2.id = #{id}
     </select>
     <update id="updateInfoByUserId" parameterType="com.xjrsoft.module.student.dto.UpdateBaseStudentInfoDto">

src/test/java/com/xjrsoft/xjrsoftboot/StrTest.java

@@ -34,8 +34,14 @@ public class StrTest {
     }
     @Test
     public void list2StrTest() {
-        List<String> list = new ArrayList();
-        String joined = String.join(",", list);
+//        List<String> list = new ArrayList();
+//        String joined = String.join(",", list);
+
+        String t = "kjk,klj,lkk,lkjd";
+        String[] ta = new String[2];
+//        ta = t.split(",");
+        System.err.println(ta[0]);
+
 
     }