diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java index 7d55ba48..2c1af2ec 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java @@ -67,22 +67,24 @@ public class PictureDisposeTask implements Runnable{ //不为空开始组装参数 入库 OcrPicture picture = new OcrPicture(); picture.setLocation(JSONObject.toJSONString(pictureSourceResult.getLocation())); - //租户编号 - picture.setTenantId(pictureSourceResult.getTenantNo()); - //租户名称 - picture.setTenantname(pictureSourceResult.getTenantName()); - //租户状态 - if(pictureSourceResult.getTenantStatus()!=null){ - picture.setTenantstatus(pictureSourceResult.getTenantStatus().toString()); - } //业务主体 + picture.setTenantId(pictureSourceResult.getAccountNo()); + //业务主体名称 + picture.setTenantname(pictureSourceResult.getAccountName()); + //业务主体状态 + if(pictureSourceResult.getAccountStatus()!=null){ + picture.setTenantstatus(pictureSourceResult.getAccountStatus().toString()); + } + //租户编号 if(pictureSourceResult.getAccountNo()!=null){ picture.setPictureid(pictureSourceResult.getAccountNo().toString()); } - //业务主体名称 + //租户名称 picture.setPicturename(pictureSourceResult.getAccountName()); - //业务主体状态 - picture.setPicturestatus(pictureSourceResult.getPlanChildStatus()); + //租户状态 + if(pictureSourceResult.getAccountStatus()!=null) { + picture.setPicturestatus(pictureSourceResult.getAccountStatus().toString()); + } //项目编号 if(pictureSourceResult.getProjectNo()!=null){ picture.setProjectid(pictureSourceResult.getProjectNo().toString());