报修完善

platform-dao/src/main/java/com/platform/dao/util/CustomExcelImportUtil.java

@@ -463,7 +463,7 @@ public class CustomExcelImportUtil {
             InputStream inputstream = new FileInputStream(fileStr);
             LocalDateTime now = LocalDateTime.now();
             //List<SbInfoVO> list = importSbInfoList(inputstream);
-            List<CheckStandard> list = importCheckStandardListByUpdate(inputstream);
+            List<SbInfoVO> list = importListByUpdateALl(inputstream);
            list.forEach(item -> {
                 System.out.println(item.toString());
             });

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -741,6 +741,26 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                 }
             }
         }
+
+        List<SysUser> userList = sysUserMapper.selectAll();
+        for(SbInfoVO vo:sbList){
+            if (vo.getRepairUser() != null) {
+                userList.forEach(sysUser -> {
+                    if (sysUser.getUserId().equals(vo.getRepairUser())) {
+                        vo.setRepairUserName(sysUser.getRealName());
+                        return;
+                    }
+                });
+            }
+            if (vo.getRepairUserSecond() != null) {
+                userList.forEach(sysUser -> {
+                    if (sysUser.getUserId().equals(vo.getRepairUserSecond())) {
+                        vo.setRepairUserNameSecond(sysUser.getRealName());
+                        return;
+                    }
+                });
+            }
+        }
         return new MyVOPage<>(sbList);
     }
 
@@ -1430,7 +1450,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                         if(!findProdcuer){
                             throw new BusinessException("找不到生产商，请先添加：" + item.getProducerId());
                         }
-                        mapper.updateByPrimaryKey(BeanConverterUtil.copyObjectProperties(item, SbInfo.class));
+                        mapper.updateByPrimaryKeySelective(BeanConverterUtil.copyObjectProperties(item, SbInfo.class));
                     }
                 }
             }