Merge remote-tracking branch 'cloud-schoolapi/ywx'

sexam/src/main/java/com/xhkjedu/sexam/mapper/paperstudent/EPaperStudentMapper.java

@@ -119,4 +119,7 @@ public interface EPaperStudentMapper extends TkMapper<EPaperStudent> {
     Integer getSubjectStateByEpsid(@Param("epsid") Integer epsid);
     //根据试卷学生id获取考试科目状态和学生试卷状态
     Map getSubjectStateAndSstageByEpsid(@Param("epsid") Integer epsid);
+
+    //更改单个学生试卷分值和状态
+    void updateStuScoreAndStateEpsid(@Param("epsid") Integer epsid);
 }

sexam/src/main/java/com/xhkjedu/sexam/service/paperstudent/EPsqbatchService.java

@@ -152,7 +152,7 @@ public class EPsqbatchService {
             ePsqbatchDetailMapper.insertList(details);//保存考试补录成绩详情
             ePaperStudentQuestionMapper.updateBatchStuQuestionSore(questions);//更改单个学生试题分值
             Integer epsid = questions.get(0).getEpsid();
-            ePaperStudentMapper.updateStuPaperscoreEpsid(epsid);//更改单个学生试卷分值
+            ePaperStudentMapper.updateStuScoreAndStateEpsid(epsid);//更改单个学生试卷分值和状态
         } catch (Exception e) {
             log.error("补录学生成绩失败：" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

sexam/src/main/java/com/xhkjedu/sexam/utils/PoiUtils.java

@@ -228,9 +228,8 @@ public class PoiUtils {
     public static String getCellValue(Cell cell) {
         String value = null;
         if (cell == null) return value;
-        DecimalFormat df = new DecimalFormat("0");  //格式化number String字符
+        DecimalFormat df = new DecimalFormat("0.##");  //格式化number String字符
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");  //日期格式化
-        DecimalFormat df2 = new DecimalFormat("0");  //格式化数字
         switch (cell.getCellTypeEnum()) {
             case STRING:
                 value = cell.getRichStringCellValue().getString();
@@ -248,7 +247,7 @@ public class PoiUtils {
                 } else if ("m/d/yy".equals(cellStyle)) {
                     value = sdf.format(cell.getDateCellValue());
                 } else {
-                    value = df2.format(cell.getNumericCellValue());
+                    value = df.format(cell.getNumericCellValue());
                 }
                 break;
             case BOOLEAN:

sexam/src/main/resources/mapper/paperstudent/EPaperStudentMapper.xml

@@ -372,4 +372,10 @@
         select concat(es.sdate,' ',es.endtime,':00')device,(right(#{studentid},2)+0)/100 score
         from e_subject es where es.esid=#{esid}
     </select>
+    <!--更改单个学生试卷分值和状态-->
+    <update id="updateStuScoreAndStateEpsid">
+        update e_paper_student ps set ps.sstate=2
+        ,ps.stuscore=(select sum(ifnull(q.stuscore,0)) from e_paper_student_question q where q.epsid=#{epsid} )
+        where ps.epsid=#{epsid}
+    </update>
 </mapper>