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

src/main/java/com/xjrsoft/common/utils/JdbcToJavaUtil.java

@@ -100,6 +100,7 @@ public class JdbcToJavaUtil {
             case LONGVARCHAR:
                 return "String";
             case DATE:
+                return "LocalDate";
             case TIMESTAMP:
                 if (dateType == 0) {
                     return "LocalDateTime";

src/main/java/com/xjrsoft/module/generator/service/impl/ApiGeneratorServiceImpl.java

@@ -174,7 +174,7 @@ public class ApiGeneratorServiceImpl implements IApiGeneratorService {
                 }
                 fieldConfig.setFieldComment(column.getComment());
                 fieldConfig.setPk(column.isPk());
-                fieldConfig.setFieldType(JdbcToJavaUtil.getClassName(column.getTypeEnum(), 1));
+                fieldConfig.setFieldType(JdbcToJavaUtil.getClassName(column.getTypeEnum(), 0));
                 fieldConfig.setFieldName(StrUtil.toCamelCase(column.getName()));
 
                 fieldConfigList.add(fieldConfig);

src/main/java/com/xjrsoft/module/student/controller/LeagueMembersManageController.java

@@ -117,6 +117,7 @@ public class LeagueMembersManageController {
                     setId(Long.toString(l.getCreateUserId()));
                     setName(l.getLeagueMembersNum());
                     setParentId(Long.toString(l.getModifyUserId()));
+                    setLevel(3);
                     setChildren(new ArrayList<>());
                 }});
                 // 当前年级已经处理
@@ -128,6 +129,7 @@ public class LeagueMembersManageController {
                         setId(Long.toString(l.getModifyUserId()));
                         setName(l.getAddress());
                         setParentId("8888");
+                        setLevel(2);
                         setChildren(new ArrayList<>());
                     }});
                 }
@@ -138,7 +140,12 @@ public class LeagueMembersManageController {
         // 为每一个节点匹配数字
         for (ClassWithLMNumTreeVo vo : dataList){
             Integer num = numMap.get(Long.parseLong(vo.getId()));
+            if(ObjectUtils.isEmpty(num)){
+                num = 0;
+            }
+            vo.setName(vo.getName() + "（" + num + "）" );
             vo.setNum(num);
+
         }
 
         dataList.sort(Comparator.comparing(ClassWithLMNumTreeVo::getName).reversed());
@@ -149,6 +156,7 @@ public class LeagueMembersManageController {
             setName("总览");
             setParentId("0");
             setNum(finalTotal);
+            setLevel(1);
             setChildren(new ArrayList<>());
         }});
 
@@ -183,6 +191,7 @@ public class LeagueMembersManageController {
                 .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, LeagueMembersManage::getUserId,
                         wrappers -> wrappers
                                 .selectAs(BaseStudentSchoolRoll::getArchivesStatus, LeagueMembersManagePageVo::getArchivesStatus)
+                                .selectAs(BaseStudentSchoolRoll::getClassId, LeagueMembersManagePageVo::getClassId)
                                 .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseStudentSchoolRoll::getArchivesStatus,
                                         wrap -> wrap
                                                 .selectAs(DictionaryDetail::getName, LeagueMembersManagePageVo::getStatusCn)
@@ -190,14 +199,19 @@ public class LeagueMembersManageController {
                                 .leftJoin(BaseClass.class, BaseClass::getId, BaseStudentSchoolRoll::getClassId,
                                         wrap -> wrap
                                                 .selectAs(BaseClass::getName, LeagueMembersManagePageVo::getClassName)
+                                                .selectAs(BaseClass::getGradeId, LeagueMembersManagePageVo::getGradeId)
                                                 .leftJoin(XjrUser.class, XjrUser::getId, BaseClass::getTeacherId,
                                                         wr -> wr
                                                                 .selectAs(XjrUser::getName, LeagueMembersManagePageVo::getTeacherName)
                                                 )
-                                                .eq(ObjectUtils.isNotEmpty(dto.getGradeId()), BaseClass::getGradeId, dto.getGradeId())
+                                                .leftJoin(BaseGrade.class, BaseGrade::getId, BaseClass::getGradeId,
+                                                        wr -> wr
+                                                                .selectAs(BaseGrade::getName, LeagueMembersManagePageVo::getGradeName)
+                                                )
+                                                .eq(ObjectUtils.isNotEmpty(dto.getNodeId()) && ObjectUtils.isNotEmpty(dto.getLevel()) && dto.getLevel() == 2, BaseClass::getGradeId, dto.getNodeId())
                                 )
                                 .like(StringUtils.isNotEmpty(dto.getArchivesStatus()), BaseStudentSchoolRoll::getArchivesStatus, dto.getArchivesStatus())
-                                .eq(ObjectUtils.isNotEmpty(dto.getClassId()), BaseStudentSchoolRoll::getClassId, dto.getClassId())
+                                .eq(ObjectUtils.isNotEmpty(dto.getNodeId()) && ObjectUtils.isNotEmpty(dto.getLevel()) && dto.getLevel() == 3, BaseStudentSchoolRoll::getClassId, dto.getNodeId())
                                 .eq(BaseStudentSchoolRoll::getDeleteMark, DeleteMark.NODELETE.getCode())
                 )
                 .leftJoin(BaseStudent.class, BaseStudent::getUserId, LeagueMembersManage::getUserId,
@@ -246,15 +260,15 @@ public class LeagueMembersManageController {
         return RT.ok(leagueMembersManageService.deleteRubAndHand(ids));
     }
 
-//    @PostMapping("/league-members-import-template")
+    @PostMapping("/league-members-template-download")
+    @ApiOperation(value = "团员信息导入模板下载")
+    @XjrLog(value = "团员信息导入模板下载")
+    public ResponseEntity<byte[]> leagueMembersTemplateDownload() throws IOException {
+//    @GetMapping("/league-members-import-template")
 //    @ApiOperation(value = "团员信息导入模板下载")
 //    @XjrLog(value = "团员信息导入模板下载")
 //    public ResponseEntity<byte[]> leagueMembersImportTemplate() throws IOException {
-    @GetMapping("/league-members-import-template")
-    @ApiOperation(value = "团员信息导入模板下载")
-    @XjrLog(value = "团员信息导入模板下载")
-    public ResponseEntity<byte[]> leagueMembersImportTemplate() throws IOException {
-        ByteArrayOutputStream bot = leagueMembersManageService.leagueMembersImportTemplate();
+        ByteArrayOutputStream bot = leagueMembersManageService.leagueMembersTemplateDownload();
 
         String fileName = "团员信息导入模板";
         fileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8);
@@ -272,14 +286,14 @@ public class LeagueMembersManageController {
         return RT.ok("全部成功", true);
     }
 
-//    @PostMapping("/league-members-export-query")
-//    @ApiOperation(value = "团员信息条件导出")
-//    @XjrLog(value = "团员信息条件导出")
-//    public ResponseEntity<byte[]> leagueMembersExportQuery(@Valid @RequestBody LeagueMembersExportQueryListDto dto) {
-    @GetMapping("/league-members-export-query")
+    @PostMapping("/league-members-export-query")
     @ApiOperation(value = "团员信息条件导出")
     @XjrLog(value = "团员信息条件导出")
-    public ResponseEntity<byte[]> leagueMembersExportQuery(@Valid LeagueMembersExportQueryDto dto) throws IOException {
+    public ResponseEntity<byte[]> leagueMembersExportQuery(@Valid @RequestBody LeagueMembersExportQueryDto dto) throws IOException {
+//    @GetMapping("/league-members-export-query")
+//    @ApiOperation(value = "团员信息条件导出")
+//    @XjrLog(value = "团员信息条件导出")
+//    public ResponseEntity<byte[]> leagueMembersExportQuery(@Valid LeagueMembersExportQueryDto dto) throws IOException {
         ByteArrayOutputStream bot = leagueMembersManageService.textbookSubscriptionExportQuery(dto);
 
         String fileName = "团员信息列表";

src/main/java/com/xjrsoft/module/student/dto/LeagueMembersExportQueryDto.java

@@ -22,11 +22,11 @@ public class LeagueMembersExportQueryDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("所属年级(base_grade)")
-    private Long gradeId;
+    @ApiModelProperty("班级年级树节点主键id")
+    private Long nodeId;
 
-    @ApiModelProperty("所属班级(base_class)")
-    private Long classId;
+    @ApiModelProperty("节点层级，1：总览，2：年级，3：班级")
+    private Integer level;
 
     @ApiModelProperty("学生姓名")
     private String studentName;

src/main/java/com/xjrsoft/module/student/dto/LeagueMembersManagePageDto.java

@@ -22,11 +22,11 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class LeagueMembersManagePageDto extends PageInput {
-    @ApiModelProperty("所属年级(base_grade)")
-    private Long gradeId;
+    @ApiModelProperty("班级年级树节点主键id")
+    private Long nodeId;
 
-    @ApiModelProperty("所属班级(base_class)")
-    private Long classId;
+    @ApiModelProperty("节点层级，1：总览，2：年级，3：班级")
+    private Integer level;
 
     @ApiModelProperty("学生姓名")
     private String studentName;

src/main/java/com/xjrsoft/module/student/service/ILeagueMembersManageService.java

@@ -25,7 +25,7 @@ public interface ILeagueMembersManageService extends MPJBaseService<LeagueMember
 
     Boolean deleteRubAndHand(List<Long> ids);
 
-    ByteArrayOutputStream leagueMembersImportTemplate() throws IOException;
+    ByteArrayOutputStream leagueMembersTemplateDownload() throws IOException;
 
     String leagueMembersImport(MultipartFile file) throws IOException, IllegalAccessException;
 

src/main/java/com/xjrsoft/module/student/service/impl/LeagueMembersManageServiceImpl.java

@@ -99,7 +99,7 @@ public class LeagueMembersManageServiceImpl extends MPJBaseServiceImpl<LeagueMem
     }
 
     @Override
-    public ByteArrayOutputStream leagueMembersImportTemplate() throws IOException {
+    public ByteArrayOutputStream leagueMembersTemplateDownload() throws IOException {
         // 开始写入
         Workbook workbook = new XSSFWorkbook();
         // 创建一个工作表(sheet)
@@ -256,7 +256,7 @@ public class LeagueMembersManageServiceImpl extends MPJBaseServiceImpl<LeagueMem
                                                 .selectAs(DictionaryDetail::getName, LeagueMembersExportQueryListVo::getStatusCn)
                                 )
                                 .like(StringUtils.isNotEmpty(dto.getArchivesStatus()), BaseStudentSchoolRoll::getArchivesStatus, dto.getArchivesStatus())
-                                .eq(ObjectUtils.isNotEmpty(dto.getClassId()), BaseStudentSchoolRoll::getClassId, dto.getClassId())
+                                .eq(ObjectUtils.isNotEmpty(dto.getNodeId()) && ObjectUtils.isNotEmpty(dto.getLevel()) && dto.getLevel() == 3, BaseStudentSchoolRoll::getClassId, dto.getNodeId())
                                 .eq(BaseStudentSchoolRoll::getDeleteMark, DeleteMark.NODELETE.getCode())
                 )
                 .leftJoin(BaseClass.class, BaseClass::getId, BaseStudentSchoolRoll::getClassId,
@@ -266,7 +266,7 @@ public class LeagueMembersManageServiceImpl extends MPJBaseServiceImpl<LeagueMem
                                         wrap -> wrap
                                                 .selectAs(XjrUser::getName, LeagueMembersExportQueryListVo::getTeacherName)
                                 )
-                                .eq(ObjectUtils.isNotEmpty(dto.getGradeId()), BaseClass::getGradeId, dto.getGradeId())
+                                .eq(ObjectUtils.isNotEmpty(dto.getNodeId()) && ObjectUtils.isNotEmpty(dto.getLevel()) && dto.getLevel() == 2, BaseClass::getGradeId, dto.getNodeId())
                 )
                 .leftJoin(BaseStudent.class, BaseStudent::getUserId, LeagueMembersManage::getUserId,
                         wrappers -> wrappers

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

@@ -17,11 +17,14 @@ public class ClassWithLMNumTreeVo implements ITreeNode<ClassWithLMNumTreeVo, Str
     @ApiModelProperty("名字")
     private String name;
 
-    @ApiModelProperty("当前级别的数量")
-    private Integer num;
-
     @ApiModelProperty("父级id")
     private String parentId;
 
+    @ApiModelProperty("节点层级，1：总览，2：年级，3：班级")
+    private Integer level;
+
+    @ApiModelProperty("当前级别的数量")
+    private Integer num;
+
     private List<ClassWithLMNumTreeVo> children;
 }

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

@@ -27,6 +27,15 @@ public class LeagueMembersManagePageVo {
     @ApiModelProperty("主键编号")
     private String id;
 
+    @ApiModelProperty("年级主键")
+    private String gradeId;
+
+    @ApiModelProperty("年级")
+    private String gradeName;
+
+    @ApiModelProperty("班级主键")
+    private String classId;
+
     @ApiModelProperty("班级")
     private String className;
 
@@ -37,7 +46,7 @@ public class LeagueMembersManagePageVo {
      * 学生主键id(xjr_user)
      */
     @ApiModelProperty("学生主键id(xjr_user)")
-    private Long userId;
+    private String userId;
 
     @ApiModelProperty("学生姓名")
     private String studentName;

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

@@ -22,7 +22,7 @@ public class FreeMarkerGeneratorTest {
     public void generateCodesTest() throws IOException {
         List<TableConfig> tableConfigs = new ArrayList<>();
         TableConfig mainTable = new TableConfig();
-        mainTable.setTableName("xjr_workflow_form_relation");
+        mainTable.setTableName("league_members_manage");
         mainTable.setIsMain(true);
         mainTable.setPkField(GlobalConstant.DEFAULT_PK);
         mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);