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

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

@@ -0,0 +1,102 @@
+package com.xjrsoft.module.student.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.page.ConventPage;
+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.AddPbCseSpecplanDto;
+import com.xjrsoft.module.student.dto.UpdatePbCseSpecplanDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.student.dto.PbCseSpecplanPageDto;
+import com.xjrsoft.module.student.entity.PbCseSpecplan;
+import com.xjrsoft.module.student.service.IPbCseSpecplanService;
+import com.xjrsoft.module.student.vo.PbCseSpecplanPageVo;
+
+import com.xjrsoft.module.student.vo.PbCseSpecplanVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+* @title: 
+* @Author szs
+* @Date: 2024-04-03
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/pbCseSpecplan")
+@Api(value = "/student"  + "/pbCseSpecplan",tags = "代码")
+@AllArgsConstructor
+public class PbCseSpecplanController {
+
+
+    private final IPbCseSpecplanService pbCseSpecplanService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="列表(分页)")
+    @SaCheckPermission("pbcsespecplan:detail")
+    public RT<PageOutput<PbCseSpecplanPageVo>> page(@Valid PbCseSpecplanPageDto dto){
+
+        LambdaQueryWrapper<PbCseSpecplan> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    //.orderByDesc(PbCseSpecplan::getId)
+                .select(PbCseSpecplan.class,x -> VoToColumnUtil.fieldsToColumns(PbCseSpecplanPageVo.class).contains(x.getProperty()));
+        IPage<PbCseSpecplan> page = pbCseSpecplanService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<PbCseSpecplanPageVo> pageOutput = ConventPage.getPageOutput(page, PbCseSpecplanPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询信息")
+    @SaCheckPermission("pbcsespecplan:detail")
+    public RT<PbCseSpecplanVo> info(@RequestParam Long id){
+        PbCseSpecplan pbCseSpecplan = pbCseSpecplanService.getById(id);
+        if (pbCseSpecplan == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(pbCseSpecplan, PbCseSpecplanVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增")
+    @SaCheckPermission("pbcsespecplan:add")
+    public RT<Boolean> add(@Valid @RequestBody AddPbCseSpecplanDto dto){
+        PbCseSpecplan pbCseSpecplan = BeanUtil.toBean(dto, PbCseSpecplan.class);
+        boolean isSuccess = pbCseSpecplanService.save(pbCseSpecplan);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改")
+    @SaCheckPermission("pbcsespecplan:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdatePbCseSpecplanDto dto){
+
+        PbCseSpecplan pbCseSpecplan = BeanUtil.toBean(dto, PbCseSpecplan.class);
+        return RT.ok(pbCseSpecplanService.updateById(pbCseSpecplan));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除")
+    @SaCheckPermission("pbcsespecplan:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(pbCseSpecplanService.removeBatchByIds(ids));
+
+    }
+
+}

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

@@ -0,0 +1,58 @@
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 
+* @Author szs
+* @Date: 2024-04-03
+* @Version 1.0
+*/
+@Data
+public class AddPbCseSpecplanDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pk;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String xyear;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pkspec;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String specname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String speccode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Integer num;
+
+}

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

@@ -0,0 +1,26 @@
+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 szs
+* @Date: 2024-04-03
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class PbCseSpecplanPageDto extends PageInput {
+
+
+}

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

@@ -0,0 +1,27 @@
+package com.xjrsoft.module.student.dto;
+
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 
+* @Author szs
+* @Date: 2024-04-03
+* @Version 1.0
+*/
+@Data
+public class UpdatePbCseSpecplanDto extends AddPbCseSpecplanDto {
+
+    private static final long serialVersionUID = 1L;
+
+}

src/main/java/com/xjrsoft/module/student/entity/PbCseSpecplan.java

@@ -0,0 +1,65 @@
+package com.xjrsoft.module.student.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 szs
+* @Date: 2024-04-03
+* @Version 1.0
+*/
+@Data
+@TableName("pb_cse_specplan")
+@ApiModel(value = "pb_cse_specplan", description = "")
+public class PbCseSpecplan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pk;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String xyear;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pkspec;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String specname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String speccode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Integer num;
+
+
+}

src/main/java/com/xjrsoft/module/student/mapper/PbCseSpecplanMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.student.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.entity.PbCseSpecplan;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 
+* @Author szs
+* @Date: 2024-04-03
+* @Version 1.0
+*/
+@Mapper
+public interface PbCseSpecplanMapper extends MPJBaseMapper<PbCseSpecplan> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.student.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.entity.PbCseSpecplan;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 
+* @Author szs
+* @Date: 2024-04-03
+* @Version 1.0
+*/
+
+public interface IPbCseSpecplanService extends MPJBaseService<PbCseSpecplan> {
+}

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

@@ -8,9 +8,11 @@ import com.xjrsoft.module.student.dto.EnrollmentStatisticsGraduationInfoDto;
 import com.xjrsoft.module.student.entity.*;
 import com.xjrsoft.module.student.mapper.PbCseFeeobjupdateMapper;
 import com.xjrsoft.module.student.service.IPbCseFeeobjupdateService;
+import com.xjrsoft.module.student.service.IPbCseSpecplanService;
 import com.xjrsoft.module.student.vo.*;
 import com.xjrsoft.module.student.dto.EnrollmentStatisticsInfoDto;
 import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.RoundingMode;
@@ -32,6 +34,10 @@ import java.util.stream.Collectors;
 @Service
 @AllArgsConstructor
 public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobjupdateMapper, PbCseFeeobjupdate> implements IPbCseFeeobjupdateService {
+
+    @Autowired
+    private final IPbCseSpecplanService pbCseSpecplanService;
+
     @Override
     public EnrollmentStatisticsInfoVo getEnrollmentStatisticsInfo(EnrollmentStatisticsInfoDto dto) {
         EnrollmentStatisticsInfoVo result = new EnrollmentStatisticsInfoVo();
@@ -61,9 +67,33 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
                         .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,
                                 (e1, e2) -> e1, LinkedHashMap::new));
             }
-            List<EnrollmentStatisticsInfoKeyValue> professionalHeadCountRes = new ArrayList<>();
+
+            //专业计划人数，余数
+            MPJLambdaWrapper<PbCseSpecplan> pbCseSpecplanMPJLambdaWrapper = new MPJLambdaWrapper<>();
+            pbCseSpecplanMPJLambdaWrapper
+                    .disableSubLogicDel()
+                    .distinct()
+                    .select("ifnull(t2.name,t.specname) as kkey")
+                    .selectAs(PbCseSpecplan::getNum, EnrollmentStatisticsInfoKeyValue::getValue)
+                    .leftJoin(BaseMajorSet.class, BaseMajorSet::getName, PbCseSpecplan::getSpecname)
+                    .leftJoin(BaseMajorCategor.class, BaseMajorCategor::getId, BaseMajorSet::getMajorCategorId)
+                    .eq(dto.getYear() != null, PbCseSpecplan::getXyear, dto.getYear())
+            ;
+
+            List<EnrollmentStatisticsInfoKeyValue> pbCseSpecplanList = pbCseSpecplanService.selectJoinList(EnrollmentStatisticsInfoKeyValue.class, pbCseSpecplanMPJLambdaWrapper);
+
+            Map<String, Long>  pbCseSpecplanSumMap = pbCseSpecplanList.stream().collect(Collectors.groupingBy(EnrollmentStatisticsInfoKeyValue::getKkey, Collectors.summingLong(EnrollmentStatisticsInfoKeyValue::getValue)));
+
+            List<ProfessionalHeadCoun> professionalHeadCountRes = new ArrayList<>();
             for (Map.Entry<String, Long> entry : professionalHeadCount.entrySet()) {
-                professionalHeadCountRes.add(new EnrollmentStatisticsInfoKeyValue(entry.getKey(), entry.getValue()));
+                professionalHeadCountRes.add(new ProfessionalHeadCoun(){{
+                    setKey(entry.getKey());
+                    setValue(entry.getValue());
+                    if(pbCseSpecplanSumMap.get(entry.getKey()) != null){
+                        setPlannedNumber(pbCseSpecplanSumMap.get(entry.getKey()));
+                        setRemainder(pbCseSpecplanSumMap.get(entry.getKey()) - entry.getValue());
+                    }
+                }});
             }
 
             //学生类型
@@ -96,13 +126,23 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
             //获取所有学生的收费明细
             MPJLambdaWrapper<PbCseFeeobjupdate> feeobjupdateXssfdetailMPJLambdaWrapper = new MPJLambdaWrapper<>();
             feeobjupdateXssfdetailMPJLambdaWrapper
-                    .selectCount(PbVXssfdetail::getPersonalid, EnrollmentStatisticsInfoVo::getPayers)
+                    .select("count(distinct t1.personalid) as payers")
                     .selectSum(PbVXssfdetail::getMny, EnrollmentStatisticsInfoVo::getRecordedAmountOfMoney)
                     .leftJoin(PbVXssfdetail.class, PbVXssfdetail::getPersonalid, PbCseFeeobjupdate::getPersonalid)
                     .eq(dto.getYear() != null, PbCseFeeobjupdate::getEnteryear, dto.getYear())
             ;
             EnrollmentStatisticsInfoVo enrollmentStatisticsInfoVo = this.selectJoinOne(EnrollmentStatisticsInfoVo.class, feeobjupdateXssfdetailMPJLambdaWrapper);
 
+            //退费金额
+//            MPJLambdaWrapper<PbCseFeeobjupdate> feeobjupdateXssfdetailMPJLambdaWrapper = new MPJLambdaWrapper<>();
+//            feeobjupdateXssfdetailMPJLambdaWrapper
+//                    .selectCount(PbVXssfdetail::getPersonalid, EnrollmentStatisticsInfoVo::getPayers)
+//                    .selectSum(PbVXssfdetail::getMny, EnrollmentStatisticsInfoVo::getRecordedAmountOfMoney)
+//                    .leftJoin(PbVXssfdetail.class, PbVXssfdetail::getPersonalid, PbCseFeeobjupdate::getPersonalid)
+//                    .eq(dto.getYear() != null, PbCseFeeobjupdate::getEnteryear, dto.getYear())
+//            ;
+//            EnrollmentStatisticsInfoVo enrollmentStatisticsInfoVo = this.selectJoinOne(EnrollmentStatisticsInfoVo.class, feeobjupdateXssfdetailMPJLambdaWrapper);
+
             //缴费人数，入账金额
             if(enrollmentStatisticsInfoVo != null){
                 result.setPayers(enrollmentStatisticsInfoVo.getPayers());

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

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.student.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.entity.PbCseSpecplan;
+import com.xjrsoft.module.student.mapper.PbCseSpecplanMapper;
+import com.xjrsoft.module.student.service.IPbCseSpecplanService;
+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 szs
+* @Date: 2024-04-03
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class PbCseSpecplanServiceImpl extends MPJBaseServiceImpl<PbCseSpecplanMapper, PbCseSpecplan> implements IPbCseSpecplanService {
+}

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

@@ -10,6 +10,11 @@ public class EnrollmentStatisticsInfoKeyValue {
      */
     @ApiModelProperty("")
     private String key;
+    /**
+     *
+     */
+    @ApiModelProperty(value = "后端处理业务使用字段",hidden = true)
+    private String kkey;
     /**
      *
      */

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

@@ -27,7 +27,7 @@ public class EnrollmentStatisticsInfoVo {
      * 专业人数
      */
     @ApiModelProperty("专业人数")
-    private List<EnrollmentStatisticsInfoKeyValue> professionalHeadCount;
+    private List<ProfessionalHeadCoun> professionalHeadCount;
     /**
      * 学生来源
      */

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

@@ -0,0 +1,54 @@
+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 szs
+* @Date: 2024-04-03
+* @Version 1.0
+*/
+@Data
+public class PbCseSpecplanPageVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pk;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String xyear;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pkspec;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String specname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String speccode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Integer num;
+
+}

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

@@ -0,0 +1,54 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: 表单出参
+* @Author szs
+* @Date: 2024-04-03
+* @Version 1.0
+*/
+@Data
+public class PbCseSpecplanVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pk;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String xyear;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String pkspec;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String specname;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String speccode;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Integer num;
+
+
+
+}

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

@@ -0,0 +1,30 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ProfessionalHeadCoun {
+    /**
+     *
+     */
+    @ApiModelProperty("")
+    private String key;
+    /**
+     *
+     */
+    @ApiModelProperty("")
+    private Long value;
+
+    /**
+     *
+     */
+    @ApiModelProperty("计划招生人数")
+    private Long plannedNumber;
+
+    /**
+     *
+     */
+    @ApiModelProperty("学位余数")
+    private Long remainder;
+}

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

@@ -2661,4 +2661,34 @@ public class FreeMarkerGeneratorTest {
 
     }
 
+    /**
+     * 专业大类
+     *
+     * @throws IOException
+     */
+    @Test
+    public void gcPbCseSpecplan() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("pb_cse_specplan");//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("szs");//作者名称
+        params.setPackageName("student");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+
+    }
 }