diff --git a/src/com/engine/shuzhi/service/impl/SzBatchExportServiceImpl.java b/src/com/engine/shuzhi/service/impl/SzBatchExportServiceImpl.java index d6de3b2..eb02466 100644 --- a/src/com/engine/shuzhi/service/impl/SzBatchExportServiceImpl.java +++ b/src/com/engine/shuzhi/service/impl/SzBatchExportServiceImpl.java @@ -49,7 +49,7 @@ public class SzBatchExportServiceImpl extends Service implements SzBatchExportSe try { RecordSet rs = new RecordSet(); // TODO 调整附件字段 - String sql = "select a.lastname ,a.workcode ,b.field15 as fileId from HrmResource a inner join cus_fielddata b on a.id =b.id and b.scopeid =1 and a.id = ? "; + String sql = "select a.lastname ,a.workcode ,b.field13 as fileId from HrmResource a inner join cus_fielddata b on a.id =b.id and b.scopeid =1 and a.id = ? "; ZipOutputStream zipOutputStream = new ZipOutputStream(Files.newOutputStream(Paths.get(outPutPath))); byte[] buffer = new byte[1024]; for (Long userId : idList) { @@ -114,19 +114,27 @@ public class SzBatchExportServiceImpl extends Service implements SzBatchExportSe ZipOutputStream zipOutputStream = new ZipOutputStream(Files.newOutputStream(Paths.get(outPutPath))); byte[] buffer = new byte[1024]; for (Long id : idList) { - String fileId = ""; + String docId = ""; String lastname = ""; String workcode = ""; String htksrq = ""; rs.executeQuery(sql, id); if (rs.next()) { - fileId = rs.getString("fileId"); + docId = rs.getString("fileId"); lastname = rs.getString("lastname"); workcode = rs.getString("workcode"); htksrq = rs.getString("htksrq"); } - if (StringUtils.isNotBlank(fileId)) { - for (String file : fileId.split(",")) { + if (StringUtils.isNotBlank(docId)) { + for (String doc : docId.split(",")) { + rs.executeQuery("select imagefileid from DocImageFile where docid = ?", doc); + String file = ""; + if (rs.next()) { + file = rs.getString("imagefileid"); + } + if (StringUtils.isBlank(file)) { + continue; + } ImageFileManager manager = new ImageFileManager(); manager.getImageFileInfoById(Util.getIntValue(file)); manager.getImageFileType(); diff --git a/src/weaver/interfaces/shuzhi/cronjob/SyncBlackListJob.java b/src/weaver/interfaces/shuzhi/cronjob/SyncBlackListJob.java index ca4eaee..cd97d4c 100644 --- a/src/weaver/interfaces/shuzhi/cronjob/SyncBlackListJob.java +++ b/src/weaver/interfaces/shuzhi/cronjob/SyncBlackListJob.java @@ -13,7 +13,7 @@ import weaver.interfaces.schedule.BaseCronJob; */ public class SyncBlackListJob extends BaseCronJob { // TODO 正式、测试表名切换 - private static final String TABLE_NAME = "edc_uf_table182"; + private static final String TABLE_NAME = "edc_uf_table160"; @Override public void execute() {