Sfoglia il codice sorgente

4770电子归档郑炎基收不到待办bug修复、招标代理上报添加咨询员工作内容

user5 3 anni fa
parent
commit
39095181a6

+ 1 - 0
src/main/java/com/jeeplus/modules/projectrecord/service/ProjectReportedImportService.java

@@ -202,6 +202,7 @@ public class ProjectReportedImportService extends CrudService<ProjectReportedImp
             reportedConsultant.setZixunyuan(zxyUserName.getId());
             reportedConsultant.setZhucezigezhKey("161");
             reportedConsultant.setWcyysrbl(20D);
+            reportedConsultant.setWordnr("审核");
             if(StringUtils.isNotBlank(projectReportedImport.getZiXunShouRu())){
                 reportedConsultant.setWcyysr(Double.valueOf(projectReportedImport.getZiXunShouRu())*0.2);
             }else{

+ 3 - 1
src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordTwoService.java

@@ -259,7 +259,9 @@ public class RuralProjectRecordTwoService  extends CrudService<RuralProjectMessa
         String businessKey = projectReportRecord.getId().toString();
         Office office = UserUtils.getSelectOffice();
         WorkActivityMenu workActivityMenu = workActivityMenuService.findByParentAndOffice("5864872f45b84acd893010e66a3db2c8", office);
-
+        if(StringUtils.isBlank(projectReportRecord.getCompanyId())){
+            projectReportRecord.setCompanyId(UserUtils.getSelectCompany().getId());
+        }
         String processType = workActivityMenu.getProcessType();
         StringBuffer buffer = new StringBuffer();
         Activity activity = new Activity();