dzx 1 rok temu
rodzic
commit
a697be7ca6

+ 21 - 4
src/main/java/com/xjrsoft/module/student/controller/ConsumptionController.java

@@ -1,7 +1,6 @@
 package com.xjrsoft.module.student.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -15,11 +14,21 @@ import com.xjrsoft.common.utils.TreeUtil;
 import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.service.IBaseClassService;
 import com.xjrsoft.module.base.service.IBaseGradeService;
-import com.xjrsoft.module.student.dto.*;
+import com.xjrsoft.module.student.dto.PbVXssfdetailPageDto;
+import com.xjrsoft.module.student.dto.PbVXsxxsfytbExcelDto;
+import com.xjrsoft.module.student.dto.PbVXsxxsfytbPageDto;
+import com.xjrsoft.module.student.dto.PersonalInfoDto;
+import com.xjrsoft.module.student.dto.PersonalPortraitFeeInformationDto;
 import com.xjrsoft.module.student.service.IPbVXssfdetailService;
 import com.xjrsoft.module.student.service.IPbVXsxxsfytbService;
-import com.xjrsoft.module.student.service.IStudentManagerService;
-import com.xjrsoft.module.student.vo.*;
+import com.xjrsoft.module.student.vo.BaseClassQfCountVo;
+import com.xjrsoft.module.student.vo.BaseClassTreeVo;
+import com.xjrsoft.module.student.vo.FeeDetailListVo;
+import com.xjrsoft.module.student.vo.PbVXssfdetailPageVo;
+import com.xjrsoft.module.student.vo.PbVXsxxsfytbExcelVo;
+import com.xjrsoft.module.student.vo.PbVXsxxsfytbPageVo;
+import com.xjrsoft.module.student.vo.PersonalPortraitFeeInformationVo;
+import com.xjrsoft.module.student.vo.PersonalPortraitPersonalInfoVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -28,6 +37,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
@@ -141,4 +151,11 @@ public class ConsumptionController {
 
         return RT.fileStream(bot.toByteArray(), "PbVXsxxsfytbExcel" + ExcelTypeEnum.XLSX.getValue());
     }
+
+    @GetMapping(value = "/fee-detail")
+    @ApiOperation(value="学生缴费的详情")
+    @SaCheckPermission("consumption:detail")
+    public RT<List<FeeDetailListVo>> feeDetail(@RequestParam String studentcode){
+        return RT.ok(pbVXsxxsfytbService.getFeeDetail(studentcode));
+    }
 }

+ 3 - 0
src/main/java/com/xjrsoft/module/student/mapper/PbVXsxxsfytbMapper.java

@@ -6,6 +6,7 @@ import com.xjrsoft.module.student.dto.EnrollmentStatisticsInfoDto;
 import com.xjrsoft.module.student.dto.PbVXsxxsfytbDto;
 import com.xjrsoft.module.student.entity.PbVXsxxsfytb;
 import com.xjrsoft.module.student.vo.BaseClassQfCountVo;
+import com.xjrsoft.module.student.vo.FeeDetailListVo;
 import com.xjrsoft.module.student.vo.PbVXsxxsfytbFeeitemVo;
 import com.xjrsoft.module.student.vo.PbVXsxxsfytbSpecnameCountVo;
 import com.xjrsoft.module.student.vo.PbVXsxxsfytbVo;
@@ -29,4 +30,6 @@ public interface PbVXsxxsfytbMapper extends MPJBaseMapper<PbVXsxxsfytb> {
     List<PbVXsxxsfytbSpecnameCountVo> getSpecnameCount(@Param("dto") EnrollmentStatisticsInfoDto dto);
 
     PbVXsxxsfytbFeeitemVo getStudentFeeInfo(@Param("dto") BaseStudentInfoDetailDto dto);
+
+    List<FeeDetailListVo> getFeeDetail(@Param("studentcode") String studentcode);
 }

+ 3 - 0
src/main/java/com/xjrsoft/module/student/service/IPbVXsxxsfytbService.java

@@ -6,6 +6,7 @@ import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.student.dto.*;
 import com.xjrsoft.module.student.entity.PbVXsxxsfytb;
 import com.xjrsoft.module.student.vo.*;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -27,4 +28,6 @@ public interface IPbVXsxxsfytbService extends MPJBaseService<PbVXsxxsfytb> {
 
 
     PbVXsxxsfytbFeeitemVo getStudentFeeInfo(String credentialNumber);
+
+    List<FeeDetailListVo> getFeeDetail(String studentcode);
 }

+ 6 - 0
src/main/java/com/xjrsoft/module/student/service/impl/PbVXsxxsfytbServiceImpl.java

@@ -20,6 +20,7 @@ import com.xjrsoft.module.student.mapper.PbSemesterConfigMapper;
 import com.xjrsoft.module.student.mapper.PbVXsxxsfytbMapper;
 import com.xjrsoft.module.student.service.IPbVXsxxsfytbService;
 import com.xjrsoft.module.student.vo.BaseClassQfCountVo;
+import com.xjrsoft.module.student.vo.FeeDetailListVo;
 import com.xjrsoft.module.student.vo.PbVXsxxsfytbExcelVo;
 import com.xjrsoft.module.student.vo.PbVXsxxsfytbFeeitemVo;
 import com.xjrsoft.module.student.vo.PbVXsxxsfytbPageVo;
@@ -242,4 +243,9 @@ public class PbVXsxxsfytbServiceImpl extends MPJBaseServiceImpl<PbVXsxxsfytbMapp
         dto.setBeltcode(lastBeltcode);
         return pbVXsxxsfytbMapper.getStudentFeeInfo(dto);
     }
+
+    @Override
+    public List<FeeDetailListVo> getFeeDetail(String studentcode) {
+        return pbVXsxxsfytbMapper.getFeeDetail(studentcode);
+    }
 }

+ 31 - 0
src/main/java/com/xjrsoft/module/student/vo/FeeDetailListVo.java

@@ -0,0 +1,31 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 表单出参
+* @Author dzx
+* @Date: 2024-03-13
+* @Version 1.0
+*/
+@Data
+public class FeeDetailListVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("费用简称")
+    private String shortName;
+    /**
+    * 
+    */
+    @ApiModelProperty("学期名称")
+    private String semesterName;
+    /**
+    * 
+    */
+    @ApiModelProperty("缴费状态")
+    private String jfzt;
+
+}

+ 8 - 0
src/main/resources/mapper/student/PbVXsxxsfytbMapper.xml

@@ -31,4 +31,12 @@
                replace(IFNULL((SELECT jfzt FROM pb_v_xsxxsfytb WHERE Studentcode = #{dto.credentialNumber} AND feeitemcode LIKE '999010603%' AND beltcode = #{dto.beltcode}),'欠费'),'未缴费','欠费') AS jcf,
                replace(IFNULL((SELECT jfzt FROM pb_v_xsxxsfytb WHERE Studentcode = #{dto.credentialNumber} AND feeitemcode = 103042766003001 AND beltcode = #{dto.beltcode}),'欠费'),'未缴费','欠费') AS ssf
     </select>
+
+    <select id="getFeeDetail" resultType="com.xjrsoft.module.student.vo.FeeDetailListVo">
+        SELECT t4.shortname,t3.name AS semester_name,REPLACE(t1.jfzt,'未交费','欠费') AS jfzt FROM pb_v_xsxxsfytb t1
+        LEFT JOIN pb_semester_config t2 ON t1.beltcode = t2.beltcode
+        LEFT JOIN base_semester t3 ON t2.base_semester_id = t3.id
+        LEFT JOIN pb_cse_feeitem2 t4 ON t1.feeitemcode = t4.feeitemcode
+        WHERE t1.Studentcode = #{studentcode}
+    </select>
 </mapper>