Merge branch 'dev' of https://git.yingcaibx.com/tl/api into dev

src/main/java/com/xjrsoft/module/teacher/controller/TeacherAwardController.java

@@ -1,12 +1,24 @@
 package com.xjrsoft.module.teacher.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+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.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 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.teacher.dto.TeacherAwardDetailPageDto;
 import com.xjrsoft.module.teacher.dto.TeacherAwardStatisticsPageDto;
+import com.xjrsoft.module.teacher.entity.TeacherAward;
+import com.xjrsoft.module.teacher.entity.TeacherAwardItem;
 import com.xjrsoft.module.teacher.service.ITeacherAwardItemService;
+import com.xjrsoft.module.teacher.service.ITeacherAwardService;
+import com.xjrsoft.module.teacher.vo.TeacherAwardDetailPageVo;
+import com.xjrsoft.module.teacher.vo.TeacherAwardItemPageVo;
+import com.xjrsoft.module.teacher.vo.TeacherAwardItemVo;
 import com.xjrsoft.module.teacher.vo.TeacherAwardStatisticsPageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -16,6 +28,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
 * @title: 教师奖项
@@ -32,6 +48,8 @@ public class TeacherAwardController {
 
     private final ITeacherAwardItemService teacherAwardItemService;
 
+    private final ITeacherAwardService teacherAwardService;
+
     @GetMapping(value = "/statistics-page")
     @ApiOperation(value="教师获奖统计")
     @SaCheckPermission("teacheraward:detail")
@@ -42,5 +60,66 @@ public class TeacherAwardController {
         return RT.ok(pageOutput);
     }
 
+    @GetMapping(value = "/detail-page")
+    @ApiOperation(value="教师获奖详情页")
+    @SaCheckPermission("teacheraward:detail")
+    public RT<PageOutput<TeacherAwardDetailPageVo>> detailPage(@Valid TeacherAwardDetailPageDto dto){
+        MPJLambdaWrapper<TeacherAward> teacherAwardMPJLambdaWrapper = new MPJLambdaWrapper<>();
+        teacherAwardMPJLambdaWrapper
+                .disableSubLogicDel()
+                .selectAs(TeacherAwardItem::getIsThesis, TeacherAwardDetailPageVo::getIsThesis)
+                .select(TeacherAward.class,x -> VoToColumnUtil.fieldsToColumns(TeacherAwardDetailPageVo.class).contains(x.getProperty()))
+                .leftJoin(TeacherAwardItem.class, TeacherAwardItem::getId, TeacherAward::getTeacherAwardItemId)
+                .eq(dto.getApplicantUserId() != null && dto.getApplicantUserId() > 0,TeacherAward::getApplicantUserId, dto.getApplicantUserId())
+                .eq(dto.getIsThesis() != null,TeacherAwardItem::getIsThesis, dto.getIsThesis())
+                .like(dto.getCompetitionName() != null && !dto.getCompetitionName().equals(""),TeacherAward::getCompetitionName, dto.getCompetitionName())
+                .orderByDesc(TeacherAward::getCreateDate)
+        ;
+        IPage<TeacherAwardDetailPageVo> page = teacherAwardService.selectJoinListPage(ConventPage.getPage(dto), TeacherAwardDetailPageVo.class, teacherAwardMPJLambdaWrapper);
+
+        //处理父级
+        LambdaQueryWrapper<TeacherAwardItem> teacherAwardItemLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        teacherAwardItemLambdaQueryWrapper
+                .orderByDesc(TeacherAwardItem::getId)
+                .select(TeacherAwardItem.class,x -> VoToColumnUtil.fieldsToColumns(TeacherAwardItemPageVo.class).contains(x.getProperty()));
+        List<TeacherAwardItem> list = teacherAwardItemService.list(teacherAwardItemLambdaQueryWrapper);
+        List<TeacherAwardItemVo> itemVos = BeanUtil.copyToList(list, TeacherAwardItemVo.class);
+
+        for(TeacherAwardDetailPageVo t : page.getRecords()){
+            List<TeacherAwardItemVo> ancestors = findAncestors(itemVos, t.getTeacherAwardItemId());
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < ancestors.size(); i++) {
+                TeacherAwardItemVo teacherAwardItemVo = ancestors.get(i);
+                if(teacherAwardItemVo != null && teacherAwardItemVo.getName() != null && !teacherAwardItemVo.getName().equals("")){
+                    sb.insert(0, ">");
+                    sb.insert(0, teacherAwardItemVo.getName());
+                }
+            }
+            sb.deleteCharAt(sb.length() - 1);
+            t.setWholeCompetitionName(sb.toString());
+        }
+
+        PageOutput<TeacherAwardDetailPageVo> pageOutput = ConventPage.getPageOutput(page, TeacherAwardDetailPageVo.class);
+        return RT.ok(pageOutput);
+
+
+    }
+
+    private List<TeacherAwardItemVo> findAncestors(List<TeacherAwardItemVo> itemVos, Long targetId) {
+        List<TeacherAwardItemVo> ancestors = new ArrayList<>();
+        Map<Long, TeacherAwardItemVo> itemMap = itemVos.stream()
+                .collect(Collectors.toMap(TeacherAwardItemVo::getId, item -> item));
+        findAncestorsHelper(itemMap, targetId, ancestors);
+        return ancestors;
+    }
 
+    private void findAncestorsHelper(Map<Long, TeacherAwardItemVo> itemMap, Long targetId, List<TeacherAwardItemVo> ancestors) {
+        if (itemMap.get(targetId) != null) {
+            TeacherAwardItemVo teacherAwardItemVo = itemMap.get(targetId);
+            ancestors.add(teacherAwardItemVo);
+            if(teacherAwardItemVo.getParentId() != null && teacherAwardItemVo.getParentId() > 0){
+                findAncestorsHelper(itemMap, teacherAwardItemVo.getParentId(), ancestors);
+            }
+        }
+    }
 }

src/main/java/com/xjrsoft/module/teacher/dto/TeacherAwardDetailPageDto.java

@@ -0,0 +1,33 @@
+package com.xjrsoft.module.teacher.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 教师奖项分页查询入参
+* @Author dzx
+* @Date: 2024-06-04
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class TeacherAwardDetailPageDto extends PageInput {
+    /**
+     * 申请人
+     */
+    @ApiModelProperty("申请人")
+    private Long applicantUserId;
+    /**
+     * 奖项名称
+     */
+    @ApiModelProperty("奖项名称")
+    private String competitionName;
+    /**
+     * 是否论文（1：是 0：否）
+     */
+    @ApiModelProperty("是否论文（1：是 0：否）")
+    private Integer isThesis;
+}

src/main/java/com/xjrsoft/module/teacher/entity/TeacherAward.java

@@ -0,0 +1,173 @@
+package com.xjrsoft.module.teacher.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 教师获奖登记
+* @Author dzx
+* @Date: 2024-06-06
+* @Version 1.0
+*/
+@Data
+@TableName("teacher_award")
+@ApiModel(value = "teacher_award", description = "教师获奖登记")
+public class TeacherAward implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 申请人
+    */
+    @ApiModelProperty("申请人")
+    private Long applicantUserId;
+    /**
+    * 获奖类型
+    */
+    @ApiModelProperty("获奖类型")
+    private String awardType;
+    /**
+    * 奖项级别
+    */
+    @ApiModelProperty("奖项级别")
+    private String awardLevel;
+    /**
+    * 奖项名称
+    */
+    @ApiModelProperty("奖项名称")
+    private String competitionName;
+    /**
+    * 获奖等级
+    */
+    @ApiModelProperty("获奖等级")
+    private String awardGrade;
+    /**
+    * 奖项分数
+    */
+    @ApiModelProperty("奖项分数")
+    private BigDecimal awardScore;
+    /**
+    * 作品名称
+    */
+    @ApiModelProperty("作品名称")
+    private String paperName;
+    /**
+    * 国际标准刊号字
+    */
+    @ApiModelProperty("国际标准刊号字")
+    private String issn;
+    /**
+    * 媒体类型（期刊、图书、报纸、音像、论文集）
+    */
+    @ApiModelProperty("媒体类型（期刊、图书、报纸、音像、论文集）")
+    private String mediaType;
+    /**
+    * 媒体名称
+    */
+    @ApiModelProperty("媒体名称")
+    private String journalName;
+    /**
+    * 国内统一刊号CN
+    */
+    @ApiModelProperty("国内统一刊号CN")
+    private String journalNumber;
+    /**
+    * 期刊级别（核心期刊、一般期刊、(校级、内部论文)）
+    */
+    @ApiModelProperty("期刊级别（核心期刊、一般期刊、(校级、内部论文)）")
+    private String journalLevel;
+    /**
+    * 发表时间
+    */
+    @ApiModelProperty("发表时间")
+    private Date issueDate;
+    /**
+    * 审核人
+    */
+    @ApiModelProperty("审核人")
+    private Long approvalUserId;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+    * 附件文件id
+    */
+    @ApiModelProperty("附件文件id")
+    private Long fileId;
+    /**
+    * 状态（1:结束 0:未结束）
+    */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+    /**
+    * 奖项id(teacher_award_item)
+    */
+    @ApiModelProperty("奖项id(teacher_award_item)")
+    private Long teacherAwardItemId;
+
+
+}

src/main/java/com/xjrsoft/module/teacher/mapper/TeacherAwardMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.teacher.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.teacher.entity.TeacherAward;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 教师获奖登记
+* @Author dzx
+* @Date: 2024-06-06
+* @Version 1.0
+*/
+@Mapper
+public interface TeacherAwardMapper extends MPJBaseMapper<TeacherAward> {
+
+}

src/main/java/com/xjrsoft/module/teacher/service/ITeacherAwardService.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.teacher.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.teacher.entity.TeacherAward;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 教师获奖登记
+* @Author dzx
+* @Date: 2024-06-06
+* @Version 1.0
+*/
+
+public interface ITeacherAwardService extends MPJBaseService<TeacherAward> {
+}

src/main/java/com/xjrsoft/module/teacher/service/impl/TeacherAwardServiceImpl.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.teacher.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.teacher.entity.TeacherAward;
+import com.xjrsoft.module.teacher.mapper.TeacherAwardMapper;
+import com.xjrsoft.module.teacher.service.ITeacherAwardService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 教师获奖登记
+* @Author dzx
+* @Date: 2024-06-06
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class TeacherAwardServiceImpl extends MPJBaseServiceImpl<TeacherAwardMapper, TeacherAward> implements ITeacherAwardService {
+}

src/main/java/com/xjrsoft/module/teacher/vo/TeacherAwardDetailPageVo.java

@@ -0,0 +1,123 @@
+package com.xjrsoft.module.teacher.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 教师奖项分页列表出参
+* @Author dzx
+* @Date: 2024-06-04
+* @Version 1.0
+*/
+@Data
+public class TeacherAwardDetailPageVo {
+
+    /**
+     * 主键编号
+     */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+     * 申请人
+     */
+    @ApiModelProperty("申请人")
+    private Long applicantUserId;
+    /**
+     * 获奖类型
+     */
+    @ApiModelProperty("获奖类型")
+    private String awardType;
+    /**
+     * 奖项级别
+     */
+    @ApiModelProperty("奖项级别")
+    private String awardLevel;
+    /**
+     * 奖项名称
+     */
+    @ApiModelProperty("奖项名称")
+    private String competitionName;
+    /**
+     * 奖项名称
+     */
+    @ApiModelProperty("完整的奖项名称")
+    private String wholeCompetitionName;
+    /**
+     * 获奖等级
+     */
+    @ApiModelProperty("获奖等级")
+    private String awardGrade;
+    /**
+     * 奖项分数
+     */
+    @ApiModelProperty("奖项分数")
+    private BigDecimal awardScore;
+    /**
+     * 作品名称
+     */
+    @ApiModelProperty("作品名称")
+    private String paperName;
+    /**
+     * 国际标准刊号字
+     */
+    @ApiModelProperty("国际标准刊号字")
+    private String issn;
+    /**
+     * 媒体类型（期刊、图书、报纸、音像、论文集）
+     */
+    @ApiModelProperty("媒体类型（期刊、图书、报纸、音像、论文集）")
+    private String mediaType;
+    /**
+     * 媒体名称
+     */
+    @ApiModelProperty("媒体名称")
+    private String journalName;
+    /**
+     * 国内统一刊号CN
+     */
+    @ApiModelProperty("国内统一刊号CN")
+    private String journalNumber;
+    /**
+     * 期刊级别（核心期刊、一般期刊、(校级、内部论文)）
+     */
+    @ApiModelProperty("期刊级别（核心期刊、一般期刊、(校级、内部论文)）")
+    private String journalLevel;
+    /**
+     * 发表时间
+     */
+    @ApiModelProperty("发表时间")
+    private Date issueDate;
+    /**
+     * 审核人
+     */
+    @ApiModelProperty("审核人")
+    private Long approvalUserId;
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+     * 附件文件id
+     */
+    @ApiModelProperty("附件文件id")
+    private Long fileId;
+    /**
+     * 状态（1:结束 0:未结束）
+     */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+    /**
+     * 奖项id(teacher_award_item)
+     */
+    @ApiModelProperty("奖项id(teacher_award_item)")
+    private Long teacherAwardItemId;
+    /**
+     * 是否论文（1：是 0：否）
+     */
+    @ApiModelProperty("是否论文（1：是 0：否）")
+    private Integer isThesis;
+}

src/test/java/com/xjrsoft/module/textbook/service/impl/TextbookServiceImplTest.java

@@ -16,10 +16,10 @@ class TextbookServiceImplTest {
     @Autowired
     private ITextbookService textbookService;
 
-    @Test
-    void dataHandleAddTextbookNode() {
+//    @Test
+//    void dataHandleAddTextbookNode() {
 //        textbookService.dataHandleAddTextbookNode(1743294003445559296L);
-    }
+//    }
 
     @Test
     void dataHandleAddExerciseBookNode() {

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

@@ -3188,4 +3188,30 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
+    @Test
+    public void gcTeacherAward() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("teacher_award");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("dzx");//作者名称
+        params.setPackageName("teacher");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(false);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+
 }