change 4 anni fa
parent
commit
87789ab55c

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamArrangementTimeMapper.java

@@ -12,4 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface ExamArrangementTimeMapper extends BaseMapper<ExamArrangementTime> {
 
     void insertExamTime(ExamArrangementTime examArrangementTime);
+
+    void removeId(Long id);
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/IExamArrangementTimeService.java

@@ -54,4 +54,6 @@ public interface IExamArrangementTimeService extends IService<ExamArrangementTim
     void insertExamArrangementTime(ExamArrangementTime examArrangementTime);
 
     void inserTime(List<ExamArrangementTime> entity2Time, Long id);
+
+    void removeId(Long id);
 }

+ 2 - 8
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamArrangementServiceImpl.java

@@ -140,20 +140,14 @@ public class ExamArrangementServiceImpl extends ServiceImpl<ExamArrangementMappe
         ExamArrangement update = BeanUtil.toBean(bo, ExamArrangement.class);
         validEntityBeforeSave(update);
         if (!CollectionUtils.isEmpty(bo.getExamArrangementTimeEditBoList())) {
+            examArrangementTimeService.removeId(bo.getId());
             bo.getExamArrangementTimeEditBoList().stream().forEach(e -> {
-                if (e.getStatus() != null && e.getStatus() == 0){
-                    LambdaQueryWrapper<ExamArrangementTime> lqw = Wrappers.lambdaQuery();
-                    lqw.eq(e.getArrangementId()!= null,ExamArrangementTime::getArrangementId,e.getArrangementId());
-                    lqw.eq(e.getEndTime() != null,ExamArrangementTime::getEndTime,e.getEndTime());
-                    lqw.eq(e.getStartTime() != null,ExamArrangementTime::getStartTime,e.getStartTime());
-                    examArrangementTimeService.remove(lqw);
-                }else {
                     ExamArrangementTime examArrangementTime = BeanUtil.toBean(e, ExamArrangementTime.class);
                     examArrangementTime.setArrangementId(bo.getId());
                     examArrangementTimeService.insertExamArrangementTime(examArrangementTime);
-                }
             });
         }
+        update.setUpdateTime(DateUtils.getNowTime());
         return this.updateById(update);
     }
 

+ 6 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamArrangementTimeServiceImpl.java

@@ -41,6 +41,7 @@ public class ExamArrangementTimeServiceImpl extends ServiceImpl<ExamArrangementT
     @Override
     public List<ExamArrangementTimeVo> queryList(ExamArrangementTimeQueryBo bo) {
         LambdaQueryWrapper<ExamArrangementTime> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getArrangement_id() != null, ExamArrangementTime::getArrangementId, bo.getArrangement_id());
         lqw.eq(bo.getStartTime() != null, ExamArrangementTime::getStartTime, bo.getStartTime());
         lqw.eq(bo.getEndTime() != null, ExamArrangementTime::getEndTime, bo.getEndTime());
         return entity2Vo(this.list(lqw));
@@ -106,4 +107,9 @@ public class ExamArrangementTimeServiceImpl extends ServiceImpl<ExamArrangementT
     public void inserTime(List<ExamArrangementTime> entity2Time,Long id) {
         entity2Time.stream().forEach(a -> baseMapper.insertExamTime(a.setArrangementId(id)));
     }
+
+    @Override
+    public void removeId(Long id) {
+        baseMapper.removeId(id);
+    }
 }

+ 4 - 0
zhongzheng-system/src/main/resources/mapper/modules/exam/ExamArrangementTimeMapper.xml

@@ -22,4 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{endTime}
              )
     </insert>
+
+    <delete id="removeId" parameterType="Long" >
+        DELETE FROM exam_arrangement_time where arrangement_id =#{id}
+    </delete>
 </mapper>