sql更新

project_data/sql/0.1.0_zhulu/soc.sql

@@ -39,6 +39,17 @@ BEGIN
     alter table core_introduce_letter
         modify letter_file text null comment '介绍信文件';
 
+    alter table core_introduce_letter_out_in_request
+        modify letter_file text null comment '介绍信附件';
+
+    alter table core_introduce_letter_out_in_request_user
+        modify img_file varchar(500) null;
+
+    alter table core_introduce_letter_user
+        modify img_file varchar(500) null;
+
+
+
 
 END ??
 DELIMITER ;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -871,8 +871,8 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             registerBookPdf.setId(id);
             registerBookPdf.setRegisterBookType(RegisterBookType.SAFETY_DRILL.getNum());
             registerBookPdf.setDate(new Date());
-            registerBookPdf.setOrgId(task.getOrgId());
-            registerBookPdf.setOrgName(task.getOrgName());
+            registerBookPdf.setOrgId(sysOrg.getId());
+            registerBookPdf.setOrgName(sysOrg.getShortName());
             registerBookPdf.setOrgPath(sysOrg.getPath());
             registerBookPdf.setFileUrl(pdfUrl);
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -856,8 +856,8 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             registerBookPdf.setId(id);
             registerBookPdf.setRegisterBookType(RegisterBookType.EDUCATION_TRAINING.getNum());
             registerBookPdf.setDate(new Date());
-            registerBookPdf.setOrgId(task.getOrgId());
-            registerBookPdf.setOrgName(task.getOrgName());
+            registerBookPdf.setOrgId(sysOrg.getId());
+            registerBookPdf.setOrgName(sysOrg.getShortName());
             registerBookPdf.setOrgPath(sysOrg.getPath());
             registerBookPdf.setFileUrl(pdfUrl);
             registerBookPdf.setFileName(fileName);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/registerbook/service/impl/CoreRegisterBookPdfServiceImpl.java

@@ -99,8 +99,13 @@ public class CoreRegisterBookPdfServiceImpl extends ServiceImpl<CoreRegisterBook
     }
 
     private CoreRegisterBookPdfPageVo getCoreRegisterBookPdfPageVo(CoreRegisterBookPdf coreRegisterBookPdf) {
+
         CoreRegisterBookPdfPageVo vo = new CoreRegisterBookPdfPageVo();
         BeanUtils.copyProperties(coreRegisterBookPdf, vo);
+        String orgName = orgService.concatOrgName(vo.getOrgId(), SecurityConstants.INNER);
+        if (ObjectUtil.isNotEmpty(orgName)){
+            vo.setOrgName(orgName);
+        }
         return vo;
 
     }