考试参数

smarking/src/main/java/com/xhkjedu/smarking/mapper/wholeparam/MspGradeparamMapper.java → smarking/src/main/java/com/xhkjedu/smarking/mapper/wholeparam/MspReportparamMapper.java

@@ -17,5 +17,8 @@ public interface MspGradeparamMapper extends TkMapper<MspReportparam> {
     //获取学校年级下指定模块参数
     List<MspReportparam> getGradeParamByGradeAndBelong(@Param("gp") GradeParams gp);
     //删除
-    int deleteGradeparam(@Param("gp")GradeParams gp);
+    int deleteGradeparam(@Param("list")List<Integer> list);
+
+    //获取学校指定年级下所有参数
+    List<MspReportparam> listAllByGrade(@Param("schoolid") Integer schoolid,@Param("gradeid") Integer gradeid);
 }

smarking/src/main/java/com/xhkjedu/smarking/service/wholeparam/MspGradeparamService.java → smarking/src/main/java/com/xhkjedu/smarking/service/wholeparam/MspReportparamService.java

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -31,12 +32,9 @@ public class MspGradeparamService {
     public void saveGradeparam(GradeParams gradeParams) {
         List<MspReportparam> originalParams = mspGradeparamMapper.getGradeParamByGradeAndBelong(gradeParams);
 
-        if(originalParams!= null && originalParams.size() > 0) {
-            mspGradeparamMapper.deleteGradeparam(gradeParams);
-        }
-
         Integer timestamp = N_Utils.getSecondTimestamp();
         List<MspReportparam> params = gradeParams.getParams();
+        List<Integer> delids = new ArrayList<>();
         for(MspReportparam param : params) {
             param.setRpbelong(gradeParams.getRpbelong());
             param.setGradeid(gradeParams.getGradeid());
@@ -45,7 +43,24 @@ public class MspGradeparamService {
             param.setHandletime(timestamp);
             if(param.getRptype() == null) param.setRptype(0);
             if(param.getGradenum() == null) param.setGradenum(0);
+
+            //如果同类型同科目的数据已存在，删除原数据
+            if(originalParams!= null && originalParams.size() > 0) {
+                MspReportparam oldParam;
+                if(N_Utils.isNotEmpty(param.getSubjectid())){
+                    oldParam = originalParams.stream().filter(p -> param.getRptype().equals(p.getRptype()) && param.getSubjectid().equals(p.getSubjectid())).findFirst().orElse(null);
+                }else{
+                    oldParam = originalParams.stream().filter(p -> param.getRptype().equals(p.getRptype())).findFirst().orElse(null);
+                }
+                if(oldParam!= null) {
+                    delids.add(oldParam.getRpid());
+                }
+            }
         }
+        if(delids.size() > 0) {
+            mspGradeparamMapper.deleteGradeparam(delids);
+        }
+
         mspGradeparamMapper.insertList(params);
 
     }

smarking/src/main/resources/mapper/wholeparam/MsGradeparamMapper.xml → smarking/src/main/resources/mapper/wholeparam/MspReportparamMapper.xml

@@ -9,6 +9,12 @@
 
     <!--删除-->
     <delete id="deleteGradeparam">
-        delete from msp_reportparam where schoolid = #{gp.schoolid} and gradeid=#{gp.gradeid} and rpbelong = #{gp.rpbelong}
+        delete from msp_reportparam where rpid in
+        <foreach collection="list" item="rpid" open="(" separator="," close=")">#{rpid}</foreach>
     </delete>
+
+    <!--获取学校指定年级下所有参数-->
+    <select id="listAllByGrade" resultType="com.xhkjedu.smarking.model.wholeparam.MspReportparam">
+        select * from msp_reportparam where schoolid = #{schoolid} and (gradeid = #{gradeid} or gradeid = 0)
+    </select>
 </mapper>