Răsfoiți Sursa

元数据bug

“zhifk” 2 ani în urmă
părinte
comite
bccf9f2210

+ 10 - 1
blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java

@@ -607,5 +607,14 @@ public class ArchivesAutoController extends BladeController {
 	public R searchInfo(@RequestParam("file") MultipartFile file, BladeUser user) {
 		return archivesAutoService.searchInfo(file);
 	}
-
+    /**
+     * 获取案卷元数据信息
+     */
+    @PostMapping("/getArchivesAutoView")
+    @ApiOperationSupport(order = 10)
+    @ApiOperation(value = "获取信息", notes = "传入id")
+    public R getArchivesAutoView(@RequestParam Long id) {
+        ArchivesAuto archivesAuto = archivesAutoService.getById(id);
+        return R.data(archivesAuto);
+    }
 }

+ 6 - 2
blade-service/blade-business/src/main/java/org/springblade/business/service/impl/MetadataClassificationServiceImpl.java

@@ -422,7 +422,11 @@ public class MetadataClassificationServiceImpl
                 }
                 //注意,user有可能获取不到,出错关注一下这个
                 sqlBuild.append("(id,tenant_id, create_user, create_time, update_user, update_time, status, is_deleted,contract_id, file_id " + fieldBuild.toString() + " ) ");
-                sqlBuild.append("values('" + SnowFlakeUtil.getId() + "','" +user==null?-1:user.getTenantId() + "','" + user==null?-1:user.getUserId() + "', '" + DateUtil.formatDateTime(new Date()) + "', '" + user==null?-1:user.getUserId() + "', '" + DateUtil.formatDateTime(new Date()) + "', '0', '0','" + byId.getContractId() + "', '" + fileId + "' " + valueBuild.toString() + ")");
+                if(user != null && user.getUserId()!=null) {
+                    sqlBuild.append("values('" + SnowFlakeUtil.getId() + "','" +  user.getTenantId() + "','" +  user.getUserId() + "', '" + DateUtil.formatDateTime(new Date()) + "', '" +  user.getUserId() + "', '" + DateUtil.formatDateTime(new Date()) + "', '0', '0','" + byId.getContractId() + "', '" + fileId + "' " + valueBuild.toString() + ")");
+                }else{
+                    sqlBuild.append("values('" + SnowFlakeUtil.getId() + "','" + (-1)  + "','" + (-1) + "', '" + DateUtil.formatDateTime(new Date()) + "', '" + (-1) + "', '" + DateUtil.formatDateTime(new Date()) + "', '0', '0','" + byId.getContractId() + "', '" + fileId + "' " + valueBuild.toString() + ")");
+                }
             } else {
                 sqlBuild.append("update u_metadata_file set ");
                 for (MetadataClassification key : metadataClassifications) {
@@ -431,7 +435,7 @@ public class MetadataClassificationServiceImpl
                     }
                 }
                 if(user != null && user.getUserId()!=null) {
-                    sqlBuild.append(" update_user = '" + user==null?-1:user.getUserId() + "' , ");
+                    sqlBuild.append(" update_user = '" + user.getUserId() + "' , ");
                 }
                 sqlBuild.append(" update_time = '" + DateUtil.formatDateTime(new Date()) + "' ");
                 sqlBuild.append(" where id = " + metadataMap.get("id"));