浏览代码

BUG修改

wangliang 2 年之前
父节点
当前提交
bd80b21b28

+ 11 - 5
themis-business/src/main/java/com/qmth/themis/business/templete/service/impl/TempleteLogicServiceImpl.java

@@ -164,18 +164,24 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
             roomCodeAndNameSet.forEach(s -> {
                 if (Objects.isNull(tbExamInvigilateUserMap) || (Objects.nonNull(tbExamInvigilateUserMap) && Objects.isNull(tbExamInvigilateUserMap.get(s)))) {
                     String[] strs = s.split(":");
-                    TBExamInvigilateUser tbExamInvigilateUser = new TBExamInvigilateUser(Long.parseLong(strs[0]), orgId, strs[1], strs[2]);
+                    QueryWrapper<TBExamInvigilateUser> tbExamInvigilateUserQueryWrapper = new QueryWrapper<>();
+                    tbExamInvigilateUserQueryWrapper.lambda().eq(TBExamInvigilateUser::getOrgId, orgId)
+                            .eq(TBExamInvigilateUser::getExamId, Long.parseLong(strs[0]))
+                            .eq(TBExamInvigilateUser::getRoomCode, strs[1]);
+                    TBExamInvigilateUser tbExamInvigilateUser = tbExamInvigilateUserService.getOne(tbExamInvigilateUserQueryWrapper);
+                    tbExamInvigilateUser = Objects.isNull(tbExamInvigilateUser) ? new TBExamInvigilateUser(Long.parseLong(strs[0]), orgId, strs[1], strs[2]) : tbExamInvigilateUser;
+                    tbExamInvigilateUser.setRoomName(strs[2]);
                     tbExamInvigilateUserList.add(tbExamInvigilateUser);
 
                     QueryWrapper<TBExamInvigilateUserTemp> tbExamInvigilateUserTempQueryWrapper = new QueryWrapper<>();
-                    tbExamInvigilateUserTempQueryWrapper.lambda().eq(TBExamInvigilateUserTemp::getExamId, Long.parseLong(strs[0]))
-                            .eq(TBExamInvigilateUserTemp::getOrgId, orgId)
-                            .eq(TBExamInvigilateUserTemp::getRoomCode, strs[1])
-                            .eq(TBExamInvigilateUserTemp::getRoomName, strs[2]);
+                    tbExamInvigilateUserTempQueryWrapper.lambda().eq(TBExamInvigilateUserTemp::getOrgId, orgId)
+                            .eq(TBExamInvigilateUserTemp::getExamId, Long.parseLong(strs[0]))
+                            .eq(TBExamInvigilateUserTemp::getRoomCode, strs[1]);
 
                     map.put("dataRemark", "编码:" + strs[1] + ",名称:" + strs[2]);
                     TBExamInvigilateUserTemp tbExamInvigilateUserTemp = tbExamInvigilateUserTempService.getOne(tbExamInvigilateUserTempQueryWrapper);
                     tbExamInvigilateUserTemp = Objects.isNull(tbExamInvigilateUserTemp) ? new TBExamInvigilateUserTemp(Long.parseLong(strs[0]), orgId, strs[1], strs[2]) : tbExamInvigilateUserTemp;
+                    tbExamInvigilateUserTemp.setRoomName(strs[2]);
                     tbExamInvigilateUserTempService.saveOrUpdate(tbExamInvigilateUserTemp);
                     count.getAndIncrement();
                 }