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

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

@@ -13,11 +13,13 @@ import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.student.dto.AddBaseStudentAssessmentCategoryDto;
+import com.xjrsoft.module.student.dto.BaseStudentAssessmentProjectPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentAssessmentCategoryDto;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentCategoryListDto;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentProject;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentCategoryService;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentCategoryListVo;
 
@@ -32,14 +34,14 @@ import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
-* @title: 学生考核类别
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
+ * @title: 学生考核类别
+ * @Author fanxp
+ * @Date: 2023-11-14
+ * @Version 1.0
+ */
 @RestController
 @RequestMapping("/student" + "/basestudentassessmentcategory")
-@Api(value = "/student"  + "/basestudentassessmentcategory",tags = "学生考核类别代码")
+@Api(value = "/student" + "/basestudentassessmentcategory", tags = "学生考核类别代码")
 @AllArgsConstructor
 public class BaseStudentAssessmentCategoryController {
 
@@ -47,27 +49,32 @@ public class BaseStudentAssessmentCategoryController {
     private final IBaseStudentAssessmentCategoryService baseStudentAssessmentCategoryService;
 
     @GetMapping(value = "/list")
-    @ApiOperation(value="学生考核类别列表(不分页)")
+    @ApiOperation(value = "学生考核类别列表(不分页)")
     @SaCheckPermission("basestudentassessmentcategory:detail")
-    public RT<List<BaseStudentAssessmentCategoryListVo>> list(@Valid BaseStudentAssessmentCategoryListDto dto){
+    public RT<List<BaseStudentAssessmentCategoryListVo>> list(@Valid BaseStudentAssessmentCategoryListDto dto) {
 
         LambdaQueryWrapper<BaseStudentAssessmentCategory> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper
-                    .orderByDesc(BaseStudentAssessmentCategory::getId)
-                    .select(BaseStudentAssessmentCategory.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentCategoryListVo.class).contains(x.getProperty()));
+                .orderByDesc(BaseStudentAssessmentCategory::getId)
+                .select(BaseStudentAssessmentCategory.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentCategoryListVo.class).contains(x.getProperty()));
 
         List<BaseStudentAssessmentCategory> list = baseStudentAssessmentCategoryService.list(queryWrapper);
+        list.forEach((node) -> {
+            if (node.getTotalScore() > 0) {
+                node.setName(String.format("%s(总分：%s)", node.getName(), node.getTotalScore().toString()));
+            }
+        });
         List<BaseStudentAssessmentCategoryListVo> listVos = BeanUtil.copyToList(list, BaseStudentAssessmentCategoryListVo.class);
         return RT.ok(listVos);
     }
 
     @GetMapping(value = "/info")
-    @ApiOperation(value="根据id查询学生考核类别信息")
+    @ApiOperation(value = "根据id查询学生考核类别信息")
     @SaCheckPermission("basestudentassessmentcategory:detail")
-    public RT<BaseStudentAssessmentCategoryVo> info(@RequestParam Long id){
+    public RT<BaseStudentAssessmentCategoryVo> info(@RequestParam Long id) {
         BaseStudentAssessmentCategory baseStudentAssessmentCategory = baseStudentAssessmentCategoryService.getById(id);
         if (baseStudentAssessmentCategory == null) {
-           return RT.error("找不到此数据！");
+            return RT.error("找不到此数据！");
         }
         return RT.ok(BeanUtil.toBean(baseStudentAssessmentCategory, BaseStudentAssessmentCategoryVo.class));
     }
@@ -76,16 +83,16 @@ public class BaseStudentAssessmentCategoryController {
     @PostMapping
     @ApiOperation(value = "新增学生考核类别")
     @SaCheckPermission("basestudentassessmentcategory:add")
-    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentAssessmentCategoryDto dto){
+    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentAssessmentCategoryDto dto) {
         BaseStudentAssessmentCategory baseStudentAssessmentCategory = BeanUtil.toBean(dto, BaseStudentAssessmentCategory.class);
         boolean isSuccess = baseStudentAssessmentCategoryService.save(baseStudentAssessmentCategory);
-    return RT.ok(isSuccess);
+        return RT.ok(isSuccess);
     }
 
     @PutMapping
     @ApiOperation(value = "修改学生考核类别")
     @SaCheckPermission("basestudentassessmentcategory:edit")
-    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentAssessmentCategoryDto dto){
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentAssessmentCategoryDto dto) {
 
         BaseStudentAssessmentCategory baseStudentAssessmentCategory = BeanUtil.toBean(dto, BaseStudentAssessmentCategory.class);
         return RT.ok(baseStudentAssessmentCategoryService.updateById(baseStudentAssessmentCategory));
@@ -95,7 +102,7 @@ public class BaseStudentAssessmentCategoryController {
     @DeleteMapping
     @ApiOperation(value = "删除学生考核类别")
     @SaCheckPermission("basestudentassessmentcategory:delete")
-    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
         return RT.ok(baseStudentAssessmentCategoryService.removeBatchByIds(ids));
 
     }

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

@@ -13,6 +13,7 @@ import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.student.dto.AddBaseStudentAssessmentProjectDto;
+import com.xjrsoft.module.student.dto.BaseStudentAssessmentProjectPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentAssessmentProjectDto;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 
@@ -22,6 +23,7 @@ import com.xjrsoft.module.student.entity.BaseStudentCadre;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentProjectService;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentProjectListVo;
 
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentProjectPageVo;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentProjectVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -47,6 +49,22 @@ public class BaseStudentAssessmentProjectController {
 
     private final IBaseStudentAssessmentProjectService baseStudentAssessmentProjectService;
 
+    @GetMapping(value = "/page")
+    @ApiOperation(value="学生考核项目列表(分页)")
+    @SaCheckPermission("basestudentassessmentproject:detail")
+    public RT<PageOutput<BaseStudentAssessmentProjectPageVo>> page(@Valid BaseStudentAssessmentProjectPageDto dto){
+
+        LambdaQueryWrapper<BaseStudentAssessmentProject> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                .orderByDesc(BaseStudentAssessmentProject::getId)
+                .eq(ObjectUtil.isNotEmpty(dto.getBaseStudentAssessmentCategoryId()), BaseStudentAssessmentProject::getBaseStudentAssessmentCategoryId, dto.getBaseStudentAssessmentCategoryId())
+                .select(BaseStudentAssessmentProject.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentProjectPageVo.class).contains(x.getProperty()));
+        IPage<BaseStudentAssessmentProject> page = baseStudentAssessmentProjectService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<BaseStudentAssessmentProjectPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentAssessmentProjectPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+
     @GetMapping(value = "/list")
     @ApiOperation(value = "学生考核项目列表(不分页)")
     @SaCheckPermission("basestudentassessmentproject:detail")

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

@@ -0,0 +1,30 @@
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+* @title: 学生考核项目分页查询入参
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentAssessmentProjectPageDto extends PageInput {
+    /**
+     * 学生考核类别(base_student_assessment_category)
+     */
+    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
+    private String baseStudentAssessmentCategoryId;
+
+}

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

@@ -0,0 +1,149 @@
+package com.xjrsoft.module.student.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 学生考核项目分页列表出参
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Data
+public class BaseStudentAssessmentProjectPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学生考核类别(base_student_assessment_category)
+    */
+    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
+    private Long baseStudentAssessmentCategoryId;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 基础分
+    */
+    @ApiModelProperty("基础分")
+    private Double basicPoints;
+    /**
+    * 扣分范围（最小）
+    */
+    @ApiModelProperty("扣分范围（最小）")
+    private Double pointsDeductedMin;
+    /**
+    * 扣分范围（最大）
+    */
+    @ApiModelProperty("扣分范围（最大）")
+    private Double pointsDeductedMax;
+    /**
+    * 加分范围（最小）
+    */
+    @ApiModelProperty("加分范围（最小）")
+    private Double addPointsMin;
+    /**
+    * 加分范围（最大）
+    */
+    @ApiModelProperty("加分范围（最大）")
+    private Double addPointsMax;
+    /**
+    * 所属机构(xjr_department)
+    */
+    @ApiModelProperty("所属机构(xjr_department)")
+    private Long departmentId;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 是否影响(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响(1:是 0:否)")
+    private Integer isAffect;
+    /**
+    * 学生操行分处理方式(xjr_dictionary_item[ap_method])
+    */
+    @ApiModelProperty("学生操行分处理方式(xjr_dictionary_item[ap_method])")
+    private String processingMethod;
+    /**
+    * 折算操行分要求
+    */
+    @ApiModelProperty("折算操行分要求")
+    private Double behaviorScore;
+    /**
+    * 操行项目编号
+    */
+    @ApiModelProperty("操行项目编号")
+    private Long baseStudentBehaviorProjectId;
+    /**
+    * 是否允许班主任修改项目(1:是 0:否)
+    */
+    @ApiModelProperty("是否允许班主任修改项目(1:是 0:否)")
+    private Integer isTeacherEdit;
+    /**
+    * 手动处理学生操行分说明
+    */
+    @ApiModelProperty("手动处理学生操行分说明")
+    private String behaviorScoreRemark;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

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

@@ -547,10 +547,10 @@ public class FreeMarkerGeneratorTest {
         params.setAuthor("fanxp");//作者名称
         params.setPackageName("student");//包名
         params.setTableConfigs(tableConfigs);
-        params.setPage(false);//是否生成分页接口
+        params.setPage(true);//是否生成分页接口
         params.setImport(false);//是否生成导入接口
         params.setExport(false);//是否生成导出接口
-        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setOutMainDir(false);//是否生成在主目录，前期测试可设置成false
         params.setDs(ds);