修改一键审批，算分，上传功能

ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/TrainingScoreController.java

@@ -91,7 +91,7 @@ public class TrainingScoreController {
         }
         for (int i = 0; i < trainingScoreList.size(); i++) {
             SysTrainingScore sysTrainingScore = trainingScoreList.get(i);
-            if (sysTrainingScore.getReportContent() == null || "".equals(sysTrainingScore.getReportContent())) {
+            if (sysTrainingScore.getReportContent() == null || "".equals(sysTrainingScore.getReportContent()) || sysTrainingScore.getTrainingReportScore() != null) {
                 continue;
             }
             String reportContent = sysTrainingScore.getReportContent();

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTrainingScoreServiceImpl.java

@@ -149,13 +149,20 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
                     if (sysTrainingScore.getTotalscore() != null &&
                             sysTrainingScore.getTrainingReportScore() != null &&
                             sysTrainingScore.getTrainingOperationScore() != null) {
+                        if (reportWeight==null){
+                            reportWeight=0.1;
+                        }if (operatorWeight==null){
+                            operatorWeight=0.9;
+                        }
+                        double reportScore = (sysTrainingScore.getTrainingReportScore().doubleValue() )* reportWeight;
+                        double operatorScore = (sysTrainingScore.getTrainingOperationScore().doubleValue()) * operatorWeight;
                         // 使用数据库中的分数创建ReportDto
                         ReportDto reportDto = new ReportDto(
                                 user.getStuClass(),
                                 user.getStudentNumber(),
                                 user.getUserName(),
-                                sysTrainingScore.getTrainingReportScore().doubleValue(),
+                                reportScore,
-                                sysTrainingScore.getTrainingOperationScore().doubleValue(),
+                                operatorScore,
                                 sysTrainingScore.getTotalscore(),
                                 sysTrainingScore.getReportFilename()
                         );
@@ -182,13 +189,20 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
                 if (sysTrainingScore.getTotalscore() != null &&
                         sysTrainingScore.getTrainingReportScore() != null &&
                         sysTrainingScore.getTrainingOperationScore() != null) {
+                    if (reportWeight==null){
+                        reportWeight=0.1;
+                    }if (operatorWeight==null){
+                        operatorWeight=0.9;
+                    }
+                    double reportScore = (sysTrainingScore.getTrainingReportScore().doubleValue() )* reportWeight;
+                    double operatorScore = (sysTrainingScore.getTrainingOperationScore().doubleValue()) * operatorWeight;
                     // 使用数据库中的分数创建ReportDto
                     ReportDto reportDto = new ReportDto(
                             sysUser.getStuClass(),
                             sysUser.getStudentNumber(),
                             sysUser.getUserName(),
-                            sysTrainingScore.getTrainingReportScore().doubleValue(),
+                            reportScore,
-                            sysTrainingScore.getTrainingOperationScore().doubleValue(),
+                            operatorScore,
                             sysTrainingScore.getTotalscore(),
                             sysTrainingScore.getReportFilename()
                     );
@@ -250,8 +264,8 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
             reportDto.setTrainingOperationScore(resultOperationScore);
             reportDto.setScoreTotal(totalScore);
             sysTrainingScore.setTotalscore(totalScore);
-            sysTrainingScore.setTrainingReportScore(resultReportScore.intValue());
+//            sysTrainingScore.setTrainingReportScore(resultReportScore.intValue());
-            sysTrainingScore.setTrainingOperationScore(resultOperationScore.intValue());
+//            sysTrainingScore.setTrainingOperationScore(resultOperationScore.intValue());
             sysTrainingScore.setPreTrainingReportScore(reportScore);
             trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore);
             gradeWeightMapper.updateByPrimaryKeySelective(sysGradeWeight);
@@ -277,7 +291,7 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
         String filePath = fileUtil.upload(file);
         SysTrainingScoreExample sysTrainingScoreExample = new SysTrainingScoreExample();
         sysTrainingScoreExample.createCriteria().andUseridEqualTo(id);
-        List<SysTrainingScore> sysTrainingScores = trainingScoreMapper.selectByExample(sysTrainingScoreExample);
+        List<SysTrainingScore> sysTrainingScores = trainingScoreMapper.selectByExampleWithBLOBs(sysTrainingScoreExample);
         if (!sysTrainingScores.isEmpty()) {
             SysTrainingScore sysTrainingScore = sysTrainingScores.get(0);
             if (sysTrainingScore != null && sysTrainingScore.getReportContent() != null && !sysTrainingScore.getReportContent().isEmpty()) {

ruoyi-system/src/main/resources/mapper/system/SysTrainingScoreMapper.xml

@@ -1613,7 +1613,7 @@
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectAllReportContent" resultMap="ResultMapWithBLOBs">
-    select id,userid,report_content from sys_training_score  WHERE report_content IS NOT NULL
+    select id,userid,report_content,training_report_score from sys_training_score  WHERE report_content IS NOT NULL
   </select>
 
   <delete id="deleteByUserId" parameterType="Long">