修复对接教师端评阅出现的bug

credit/src/main/java/com/sztzjy/digital_credit/config/Constant.java

@@ -250,13 +250,13 @@ public class Constant {
             "刘先生养老保险金账户余额为208000元，医疗保险账户余额为140000元，住房公积金账户余额98000元，未出现过断缴情况";
 
 
-    public static final String PERSONYXYSFX_MODULE = "个人影响因素分析";
-    public static final String PERSONZXYHFX_MODULE = "个人征信优化分析";
-    public static final String PERSONZXPJMX_MOXULE = "个人征信评级模型";
+    public static final String PERSONYXYSFX_MODULE = "影响因素分析";
+    public static final String PERSONZXYHFX_MODULE = "征信优化分析";
+    public static final String PERSONZXPJMX_MOXULE = "征信评级模型";
 
 
-    public static final String QIYEYXYSFX_MODULE = "企业影响因素分析";
-    public static final String QIYEZXYHFX_MODULE = "企业征信优化分析";
-    public static final String QIYEZXPJMX_MOXULE = "企业征信评级模型";
+    public static final String QIYEYXYSFX_MODULE = "影响因素分析";
+    public static final String QIYEZXYHFX_MODULE = "征信优化分析";
+    public static final String QIYEZXPJMX_MOXULE = "征信评级模型";
 
 }

credit/src/main/java/com/sztzjy/digital_credit/config/exception/handler/GlobalExceptionHandler.java

@@ -76,4 +76,13 @@ public class GlobalExceptionHandler {
     }
 
 
+
+
+    @ExceptionHandler(ServiceException.class)
+    public ServiceException serviceExceptionException(ServiceException e) {
+
+        System.out.println(e);
+        return new ServiceException(HttpStatus.ACCEPTED,"文件不能为空！");
+    }
+
 }

credit/src/main/java/com/sztzjy/digital_credit/config/exception/handler/ServiceException.java

@@ -5,7 +5,7 @@ import org.springframework.http.HttpStatus;
 public class ServiceException extends RuntimeException {
 
     private HttpStatus code;
-    private String msg;
+    private Object msg;
 
     public ServiceException() {
     }
@@ -13,12 +13,23 @@ public class ServiceException extends RuntimeException {
     public ServiceException(HttpStatus code) {
         this.code = code;
     }
-    public ServiceException(HttpStatus code, String msg) {
-        super(msg);
+
+    public ServiceException(Object msg) {
+        this.code = HttpStatus.ACCEPTED;
+        this.msg = msg;
+    }
+    public ServiceException(HttpStatus code, Object msg) {
         this.code = code;
         this.msg = msg;
     }
 
+    public ServiceException(HttpStatus httpStatus, ServiceException e) {
+
+        this.code = httpStatus;
+        this.msg = e;
+
+    }
+
     public HttpStatus getCode() {
         return code;
     }
@@ -27,7 +38,7 @@ public class ServiceException extends RuntimeException {
         this.code = code;
     }
 
-    public String getMsg() {
+    public Object getMsg() {
         return msg;
     }
 

credit/src/main/java/com/sztzjy/digital_credit/controller/StuConceptBlockController.java

@@ -301,10 +301,6 @@ public class StuConceptBlockController {
         }
 
 
-
-
-
-
     }
 
 

credit/src/main/java/com/sztzjy/digital_credit/controller/tch/StuUserDto.java

@@ -24,5 +24,5 @@ public class StuUserDto {
 
     private Double rating;
 
-//  private Integer reportStatus;
+  private Integer id;
 }

credit/src/main/java/com/sztzjy/digital_credit/controller/tch/TchConceptTechnologyAchievement.java

@@ -263,20 +263,23 @@ public class TchConceptTechnologyAchievement {
         StuPracticalTrainingReportExample example=new StuPracticalTrainingReportExample();
         StuPracticalTrainingReportExample.Criteria criteria = example.createCriteria();
         criteria.andSchoolIdEqualTo(schoolId);
+
         if(Constant.CREDIT_PORTRAIT_SCORE.equals(module)){
+            criteria.andAscriptionEqualTo("征信画像");
             List<String> list=new ArrayList<>();
             list.add(Constant.DKAL_MODULE);
             list.add(Constant.GRQKYWY_MODULE);
             list.add(Constant.HKXWYWY_MODULE);
             criteria.andModuleIn(list);
         }else if(Constant.PERSONAL_CREDIT_SCORE.equals(module)){
+            criteria.andAscriptionEqualTo("个人征信");
             List<String> list=new ArrayList<>();
             list.add(Constant.PERSONYXYSFX_MODULE);
             list.add(Constant.PERSONZXYHFX_MODULE);
             list.add(Constant.PERSONZXPJMX_MOXULE);
             criteria.andModuleIn(list);
         }else if(Constant.CORPORATE_CREDIT_SCORE.equals(module)){
-
+            criteria.andAscriptionEqualTo("企业征信");
             List<String> list=new ArrayList<>();
             list.add(Constant.QIYEYXYSFX_MODULE);
             list.add(Constant.QIYEZXYHFX_MODULE);
@@ -312,8 +315,9 @@ public class TchConceptTechnologyAchievement {
                                                                      @ApiParam("姓名或者学号") @RequestParam(required = false) String name,
                                                                      @RequestParam(required = false) String studentId,
                                                                      @RequestParam(required = false) String className,
-                                                                     @ApiParam("模块") @RequestParam(required = false) String keyWord) {
-        return new ResultEntity<>(userService.getScoreReport(schoolId, index, size, module, name, studentId, className,keyWord));
+                                                                     @ApiParam("模块") @RequestParam(required = false) String keyWord,
+                                                                     String ascription) {
+        return new ResultEntity<>(userService.getScoreReport(schoolId, index, size, module, name, studentId, className,keyWord,ascription));
     }
 
 
@@ -369,7 +373,7 @@ public class TchConceptTechnologyAchievement {
         practicalTrainingReportMapper.updateByPrimaryKeySelective(practicalTrainingReport);
         if (practicalTrainingReport.getRating() != null) {
             StuScoreDetailsExample stuScoreDetailsExample = new StuScoreDetailsExample();
-            stuScoreDetailsExample.createCriteria().andModuleEqualTo(practicalTrainingReport.getModule()).andUserIdEqualTo(practicalTrainingReport.getUserid()).andSerialNumberEqualTo(5);
+            stuScoreDetailsExample.createCriteria().andModuleEqualTo(practicalTrainingReport.getModule()).andUserIdEqualTo(practicalTrainingReport.getUserid()).andSerialNumberEqualTo(5).andAscriptionEqualTo(practicalTrainingReport.getAscription());
             List<StuScoreDetails> stuScoreDetails = stuScoreDetailsMapper.selectByExample(stuScoreDetailsExample);
             if (!stuScoreDetails.isEmpty()) {
                 StuScoreDetails stuScoreDetails1 = stuScoreDetails.get(0);

credit/src/main/java/com/sztzjy/digital_credit/controller/tch/TchPracticalTrainingReportDto.java

@@ -22,6 +22,7 @@ public class TchPracticalTrainingReportDto {
     private Date uploadTime; //上传时间
     private Integer size;//报告大小
     private Double rating;//教师评分
+    private String url; //文件路径
 
     public TchPracticalTrainingReportDto(StuUser stuUser, StuPracticalTrainingReport report) {
         this.userId=stuUser.getUserId();
@@ -33,5 +34,6 @@ public class TchPracticalTrainingReportDto {
         this.uploadTime=report.getUploadTime();
         this.size=report.getSize();
         this.rating=report.getRating();
+        this.url ="/uploadFile"+ report.getUrl();
     }
 }

credit/src/main/java/com/sztzjy/digital_credit/entity/TchCaseBaseInfo.java

@@ -3,6 +3,9 @@ package com.sztzjy.digital_credit.entity;
 import java.util.Date;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotNull;
 
@@ -12,6 +15,9 @@ import javax.validation.constraints.NotNull;
  * @author whb
  * tch_case_base_info
  */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class TchCaseBaseInfo {
     @ApiModelProperty("ID")
     private String id;
@@ -43,6 +49,10 @@ public class TchCaseBaseInfo {
     @ApiModelProperty("案例详情")
     private String caseDetails;
 
+
+    @ApiModelProperty("用户ID")
+    private String userId;
+
     public String getId() {
         return id;
     }

credit/src/main/java/com/sztzjy/digital_credit/mapper/StuUserDtoMapper.java

@@ -14,5 +14,6 @@ public interface StuUserDtoMapper {
                                        @Param("className") String className,
                                        @Param("module") String module,
                                        @Param("keyWord") String keyWord,
-                                       @Param("schoolId") String schoolId);
+                                       @Param("schoolId") String schoolId,
+                                       @Param("ascription") String ascription);
 }

credit/src/main/java/com/sztzjy/digital_credit/service/StuUserService.java

@@ -80,7 +80,7 @@ public interface StuUserService {
     void manualRatingByTeacher(TchManualRatingByTeacherDTO manualRatingByTeacherDTO);
 
 
-    PageInfo<StuUserDto> getScoreReport(String schoolId, Integer index, Integer size, String module, String name, String studentId, String className, String keyWord);
+    PageInfo<StuUserDto> getScoreReport(String schoolId, Integer index, Integer size, String module, String name, String studentId, String className, String keyWord, String ascription);
 
     //班级下拉框
     List<String> getClassNameBySchoolId(@Param("schoolId") String schoolId);

credit/src/main/java/com/sztzjy/digital_credit/service/impl/CaseManagementByEnterpriseServiceImpl.java

@@ -104,9 +104,7 @@ public class CaseManagementByEnterpriseServiceImpl implements CaseManagementByEn
     public ResultEntity updateBaseInfoByCase(TchCaseBaseInfo tchCaseBaseInfo) {
 
 
-        if (!Constant.BUILT_IN_SCHOOL_ID.equals(tchCaseBaseInfo.getSchoolId()) ){
-            return new ResultEntity<>("权限不符,请联系管理员！");
-        }
+
 
 
         TchCaseBaseInfoExample example = new TchCaseBaseInfoExample();
@@ -122,6 +120,10 @@ public class CaseManagementByEnterpriseServiceImpl implements CaseManagementByEn
             caseBaseInfo.setId(id);
             caseBaseInfo.setUpdateTime(new Date());
 
+            if (!Constant.BUILT_IN_SCHOOL_ID.equals(tchCaseBaseInfo.getUserId()) ){
+                return new ResultEntity<>("权限不符,请联系管理员！");
+            }
+
             mapper.updateByPrimaryKeyWithBLOBs(caseBaseInfo);
 
         return new ResultEntity<>("更新成功");
@@ -818,7 +820,7 @@ public class CaseManagementByEnterpriseServiceImpl implements CaseManagementByEn
             BeanUtils.copyProperties(tchCreditRecordBaseInfo,info);
             info.setId(id);
 
-            if (!Constant.BUILT_IN_SCHOOL_ID.equals(tchCreditRecordBaseInfo.getSchoolId()) ){
+            if (!Constant.BUILT_IN_SCHOOL_ID.equals(tchCreditRecordBaseInfo.getUserId()) ){
                 return new ResultEntity<>("权限不符,请联系管理员！");
             }
 

credit/src/main/java/com/sztzjy/digital_credit/service/impl/StuConceptBlockServiceImpl.java

@@ -4,6 +4,7 @@ package com.sztzjy.digital_credit.service.impl;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.IdUtil;
 
+import com.sztzjy.digital_credit.config.exception.handler.ServiceException;
 import com.sztzjy.digital_credit.entity.*;
 import com.sztzjy.digital_credit.entity.dto.StuBlockProductWithDTO;
 import com.sztzjy.digital_credit.mapper.*;
@@ -12,6 +13,7 @@ import com.sztzjy.digital_credit.util.PdfUtil;
 import com.sztzjy.digital_credit.util.file.IFileUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
@@ -23,6 +25,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.math.BigDecimal;
+import java.rmi.ServerException;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
@@ -141,7 +144,7 @@ public class StuConceptBlockServiceImpl implements StuConceptBlockService {
     public StuPracticalTrainingReport upload(MultipartFile file, StuBlockProductWithDTO stuBlockProductWithBLOBs) {
 
         if (file.isEmpty()) {
-            throw new RuntimeException("文件不能为空");
+            throw new ServiceException("文件不能为空");
         }
         if (stuBlockProductWithBLOBs == null) {
             throw new RuntimeException("模块或用户ID不能为空");
@@ -382,7 +385,7 @@ public class StuConceptBlockServiceImpl implements StuConceptBlockService {
 
         //获取实验报告
         StuPracticalTrainingReportExample export = new StuPracticalTrainingReportExample();
-        export.createCriteria().andUseridEqualTo(userId).andModuleEqualTo(module);
+        export.createCriteria().andUseridEqualTo(userId).andModuleEqualTo(module).andAscriptionEqualTo(ascription);
 
         if (stuPracticalTrainingReportMapper.selectByExample(export).size() != 0) {
             StuPracticalTrainingReport report = stuPracticalTrainingReportMapper.selectByExample(export).get(0);

credit/src/main/java/com/sztzjy/digital_credit/service/impl/StuUserServiceImpl.java

@@ -311,8 +311,8 @@ public class StuUserServiceImpl implements StuUserService {
     }
 
     @Override
-    public PageInfo<StuUserDto> getScoreReport(String schoolId, Integer index, Integer size, String module, String name, String studentId, String className, String keyWord) {
-        List<StuUserDto> userDtoList = stuUserDtoMapper.selectByCondition(name, studentId, className, module, keyWord, schoolId);
+    public PageInfo<StuUserDto> getScoreReport(String schoolId, Integer index, Integer size, String module, String name, String studentId, String className, String keyWord, String ascription) {
+        List<StuUserDto> userDtoList = stuUserDtoMapper.selectByCondition(name, studentId, className, module, keyWord, schoolId,ascription);
         PageInfo<StuUserDto> pageInfo = PageUtil.pageHelper(userDtoList, index, size);
         return pageInfo;
     }

credit/src/main/java/com/sztzjy/digital_credit/service/impl/TchHomePageServiceImpl.java

@@ -3,6 +3,7 @@ package com.sztzjy.digital_credit.service.impl;/**
  * @date 2024-04-30 14:55
  */
 
+import cn.hutool.core.convert.Convert;
 import com.sztzjy.digital_credit.entity.*;
 import com.sztzjy.digital_credit.entity.dto.ClassAVGScoreVo;
 import com.sztzjy.digital_credit.entity.dto.TeaClassScoreDto;
@@ -147,21 +148,17 @@ public class TchHomePageServiceImpl implements TchHomePageService {
         System.out.println("接受的参数schoolId=："+schoolId);
         System.out.println("接受的参数classId=："+classId);
         System.out.println("接受的参数time=："+time);
-
-
-        // 创建一个 Calendar 实例并设置为 UTC 时区
-        Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+        // 创建一个 Calendar 实例
+        Calendar calendar = Calendar.getInstance();
         calendar.setTime(time);
 
-        // 将时区转换为 CST
-        calendar.setTimeZone(TimeZone.getTimeZone("CST"));
+        // 减去 8 小时
+        calendar.add(Calendar.HOUR, -8);
 
         // 获取转换后的 Date 对象
-        Date cstTime = calendar.getTime();
-
-
-        System.out.println("修改的的参数time=："+cstTime);
+        Date cstDate = calendar.getTime();
 
+        System.out.println("修改的的参数time=："+cstDate);
 
 
 
@@ -171,7 +168,7 @@ public class TchHomePageServiceImpl implements TchHomePageService {
         //班级框为空 统计学校下的所有数据返回
         if (classId == null && schoolId != null) {
             System.out.println("进入空1111111111111：++++++++++++++=111111111111111111111111:");
-            criteria.andSchoolIdEqualTo(schoolId).andCreateTimeEqualTo(cstTime);
+            criteria.andSchoolIdEqualTo(schoolId).andCreateTimeEqualTo(cstDate);
             List<TchClassAverageScore> teaClassScores = tchClassAverageScoreMapper.selectByExample(teaClassScoreExample);
             int schoolExcellentCount = 0;
             int schoolGoodCount = 0;
@@ -222,11 +219,12 @@ public class TchHomePageServiceImpl implements TchHomePageService {
             return teaClassScoreDto;
         } else {        //选中某个班级返回
             System.out.println("进入else：++++++++++++++=111111111111111111111111:");
-            criteria.andClassIdEqualTo(classId).andCreateTimeEqualTo(cstTime);
+            criteria.andClassIdEqualTo(classId).andCreateTimeEqualTo(cstDate);
             List<TchClassAverageScore> teaClassScores = tchClassAverageScoreMapper.selectByExample(teaClassScoreExample);
-            System.out.println("查询的时间为："+cstTime);
+            System.out.println("查询的时间为："+cstDate);
 
             if (teaClassScores.isEmpty()) {
+                System.out.println("teaClassScores.isEmpty()");
                 return new TeaClassScoreDto();
             }
             TchClassAverageScore teaClassScore = teaClassScores.get(0);

credit/src/main/resources/mappers/StuUserDtoMapper.xml

@@ -10,10 +10,11 @@
         <result property="reportUrl" column="url"/>
         <result property="reportId" column="id"/>
         <result property="rating" column="rating"/>
+        <result property="id" column="id"   />
     </resultMap>
 
     <select id="selectByCondition" resultMap="BaseResultMap">
-        select u.user_id,u.name,u.student_id,u.class_name,r.module,r.url,r.id,r.rating
+        select u.user_id,u.name,u.student_id,u.class_name,r.module,r.url,r.id,r.rating,r.ascription,r.id
         from stu_user u
         JOIN stu_practical_training_report r ON u.user_id = r.userId
         <where>
@@ -22,10 +23,10 @@
                 AND r.module IN ('贷款案例', '个人情况与违约', '还款行为与违约')
             </if>
             <if test="module =='个人征信成绩'">
-                AND r.module IN ('个人影响因素分析', '个人征信优化分析','个人征信评级模型')
+                AND r.module IN ('影响因素分析', '征信优化分析','征信评级模型')
             </if>
             <if test="module =='企业征信成绩'">
-                AND r.module IN ('企业影响因素分析', '企业征信优化分析','企业征信评级模型')
+                AND r.module IN ('影响因素分析', '征信优化分析','征信评级模型')
             </if>
 
             <if test="name != null">
@@ -34,6 +35,9 @@
             <if test="studentId != null">
                 AND u.student_id = #{studentId}
             </if>
+            <if test="ascription != null">
+                AND r.ascription = #{ascription}
+            </if>
             <if test="className != null">
                 AND u.class_name = #{className}
             </if>