feat: 修改签到逻辑

guzijian
1 parent f50323cd
Showing 1 changed file with 11 additions and 2 deletions
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
@@ -11,6 +11,7 @@ import java.util.stream.Collectors;
  
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.http.HttpUtil;
+import com.github.pagehelper.util.StringUtil;
 import com.ruoyi.common.cache.NowSchedulingCache;
 import com.ruoyi.common.cache.SchedulingCache;
 import com.ruoyi.common.config.RuoYiConfig;
@@ -487,11 +488,11 @@ public class DriverServiceImpl implements IDriverService {
     public void updateDriverSignInfo(DriverSignInRequestVo vo) {
         log.info("开始进行人员数据更新");
         Driver driver = new Driver();
-        driver.setJobCode(vo.getJobCode());
+        driver.setJobCode(handlerJobCode(vo));
         driver.setPersonnelName(vo.getName());
         driver.setPosts(vo.getPosts());
         String base64 = vo.getImage();
-        String fileName = vo.getJobCode() + ".png";
+        String fileName = handlerJobCode(vo) + ".png";
         String filePath = getPathUrl(new File(RuoYiConfig.getUploadPath() + headImagePre + "/" + File.separator + fileName));
         try {
             fileName = FileUploadUtils.getPathFileName(RuoYiConfig.getUploadPath() + headImagePre, fileName);
@@ -510,6 +511,14 @@ public class DriverServiceImpl implements IDriverService {
         threadJobService.asyncStartUploadBase64Image(filePath, base64);
     }
  
+    private static String handlerJobCode(DriverSignInRequestVo vo) {
+        if (StringUtil.isEmpty(vo.getJobCode())){
+            return vo.getJobCode();
+        }
+        String[] split = vo.getJobCode().split("-");
+        return split[split.length - 1];
+    }
+
     private String getPathUrl(File desc) {
         if (!desc.exists()) {
             if (!desc.getParentFile().exists()) {