|
|
@@ -8,6 +8,7 @@ import org.apache.commons.io.IOUtils;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.springblade.business.entity.InformationQuery;
|
|
|
import org.springblade.business.entity.TrialSelfInspectionRecord;
|
|
|
+import org.springblade.business.feign.MessageWarningClient;
|
|
|
import org.springblade.business.feign.TaskClient;
|
|
|
import org.springblade.business.vo.TaskSignInfoVO;
|
|
|
import org.springblade.business.vo.TrialRawMaterialSelfRecord;
|
|
|
@@ -65,13 +66,14 @@ public class EVDataServiceImpl implements EVDataService {
|
|
|
@Autowired
|
|
|
StringRedisTemplate RedisTemplate;
|
|
|
@Autowired
|
|
|
- private StartEventListener startEventListener;
|
|
|
+ private final MessageWarningClient messageWarningClient;
|
|
|
|
|
|
/**
|
|
|
* 电签主要流程
|
|
|
*
|
|
|
* @param taskApp
|
|
|
*/
|
|
|
+
|
|
|
@Override
|
|
|
public void signTaskBatch(TaskSignInfoVO taskApp) {
|
|
|
//获取pdf 文件
|
|
|
@@ -145,7 +147,7 @@ public class EVDataServiceImpl implements EVDataService {
|
|
|
// 修改 主 任务 u_task 表 状态改为3
|
|
|
String up_task_par = "update u_task_parallel set status=3 where parallel_process_instance_id='"+taskApp.getParallelProcessInstanceId()+"'";
|
|
|
String up_task = "update u_task set status=3 where id='"+taskApp.getTaskId()+"'";
|
|
|
- this.jdbcTemplate.execute("delete from u_task_batch where id="+taskApp.getId());
|
|
|
+ this.jdbcTemplate.execute("delete from u_task_batch where id in("+taskApp.getId()+")");
|
|
|
jdbcTemplate.execute(up_task_par);
|
|
|
jdbcTemplate.execute(up_task);
|
|
|
|
|
|
@@ -157,6 +159,8 @@ public class EVDataServiceImpl implements EVDataService {
|
|
|
jdbcTemplate.execute("update u_information_query set e_visa_pdf_url='',status=0 where id='"+taskApp.getFormDataId()+"'");
|
|
|
}
|
|
|
RedisTemplate.delete("sign-" + taskApp.getFormDataId());
|
|
|
+ // 添加废除通知
|
|
|
+ //messageWarningClient.
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -168,8 +172,13 @@ public class EVDataServiceImpl implements EVDataService {
|
|
|
List<Map<String, Object>> maps = jdbcTemplate.queryForList(sql);
|
|
|
String id = SnowFlakeUtil.getId() + "";
|
|
|
if (maps == null || maps.size() == 0) {
|
|
|
+ String batchId = taskApp.getId();
|
|
|
+ if(taskApp.getId().indexOf(",")>=0){
|
|
|
+ batchId = taskApp.getId().split(",")[0];
|
|
|
+ }
|
|
|
+
|
|
|
String sql2 = "INSERT into u_task_batch(id,task_parallel_id,json_data,create_user,create_dept,create_time,update_user,update_time,status,is_deleted,nick_name,sign_format,sign_type)" +
|
|
|
- "SELECT " + id + " as id,task_parallel_id,json_data,create_user,create_dept,create_time,update_user,update_time,status,is_deleted,nick_name,sign_format,2 as sign_type from u_task_batch where id=" + taskApp.getId() + "";
|
|
|
+ "SELECT " + id + " as id,task_parallel_id,json_data,create_user,create_dept,create_time,update_user,update_time,status,is_deleted,nick_name,sign_format,2 as sign_type from u_task_batch where id=" + batchId + "";
|
|
|
jdbcTemplate.execute(sql2);
|
|
|
}
|
|
|
}
|
|
|
@@ -183,7 +192,7 @@ public class EVDataServiceImpl implements EVDataService {
|
|
|
// 获取pdf 文件
|
|
|
@Transactional
|
|
|
public void SignBackPdfInfo(TaskSignInfoVO taskApp) {
|
|
|
- Integer totalCount = this.jdbcTemplate.queryForObject("select exe_count from u_task_parallel where parallel_process_instance_id='" + taskApp.getParallelProcessInstanceId() + "'", Integer.class);
|
|
|
+ Integer totalCount = this.jdbcTemplate.queryForObject("select min(exe_count) as exe_count from u_task_parallel where parallel_process_instance_id in(" + taskApp.getParallelProcessInstanceId() + ")", Integer.class);
|
|
|
//上报类型: 1填报资料，2工程文件，3日志资料
|
|
|
//档案：4档案数据 ,
|
|
|
//计量： 5中间计量申请，6材料计量单 ,7开工预付款计量单, 8变更令
|
|
|
@@ -313,23 +322,23 @@ public class EVDataServiceImpl implements EVDataService {
|
|
|
updateSql = "update u_information_query set e_visa_pdf_url='" + taskApp.getLastFilePdfUrl() + "',status=" + taskApp.getSigType() + " where id='" + taskApp.getFormDataId() + "'";
|
|
|
}
|
|
|
this.jdbcTemplate.execute(updateSql);
|
|
|
- this.jdbcTemplate.execute("update u_task_parallel set e_visa_status=1,e_visa_content='" + taskApp.getSignSmg() + "' , status=2 , initiative=2 ,update_time=SYSDATE() where parallel_process_instance_id='" + taskApp.getParallelProcessInstanceId() + "'");
|
|
|
+ this.jdbcTemplate.execute("update u_task_parallel set e_visa_status=1,e_visa_content='" + taskApp.getSignSmg() + "' , status=2 , initiative=2 ,update_time=SYSDATE() where parallel_process_instance_id in(" + taskApp.getParallelProcessInstanceId() + ")");
|
|
|
this.jdbcTemplate.execute("update u_task set status=" + taskApp.getSigType() + " ,update_time=SYSDATE() where id='" + taskApp.getTaskId() + "'");
|
|
|
- this.jdbcTemplate.execute("delete from u_task_batch where id=" + taskApp.getId());
|
|
|
+ this.jdbcTemplate.execute("delete from u_task_batch where id in(" + taskApp.getId()+")");
|
|
|
|
|
|
} else { //签字失败
|
|
|
- this.jdbcTemplate.execute("update u_task_parallel set exe_count=(exe_count+1), e_visa_status=99,e_visa_content='" + taskApp.getSignSmg() + "' ,update_time=SYSDATE() where parallel_process_instance_id='" + taskApp.getParallelProcessInstanceId() + "'");
|
|
|
+ this.jdbcTemplate.execute("update u_task_parallel set exe_count=(exe_count+1), e_visa_status=99,e_visa_content='" + taskApp.getSignSmg() + "' ,update_time=SYSDATE() where parallel_process_instance_id in (" + taskApp.getParallelProcessInstanceId() + ")");
|
|
|
this.jdbcTemplate.execute("update u_task set status=1 ,update_time=SYSDATE() where id='" + taskApp.getTaskId() + "'");
|
|
|
if (totalCount >= 3) {
|
|
|
- this.jdbcTemplate.execute("delete from u_task_batch where id=" + taskApp.getId());
|
|
|
+ this.jdbcTemplate.execute("delete from u_task_batch where id in(" + taskApp.getId()+")");
|
|
|
}
|
|
|
}
|
|
|
RedisTemplate.delete("sign-" + taskApp.getFormDataId());
|
|
|
} catch (Exception e) {
|
|
|
taskApp.setSigState(2);
|
|
|
taskApp.setSignSmg("修改业务数据异常-请联系开发人员");
|
|
|
- SignBackPdfInfo(taskApp);
|
|
|
e.printStackTrace();
|
|
|
+ SignBackPdfInfo(taskApp);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -353,7 +362,7 @@ public class EVDataServiceImpl implements EVDataService {
|
|
|
if ("1".equals(type)) {
|
|
|
String approvalPdf = eVisaPdfUrl.length() >= 10 ? eVisaPdfUrl : pdfUrl;
|
|
|
approvalPdf = pdfTrialUrl.length() >= 10 ? pdfTrialUrl : approvalPdf;
|
|
|
- approvalPdf = pdfTrialUrl.length() >= 10 ? pdfTrialUrlPosition : approvalPdf;
|
|
|
+ approvalPdf = pdfTrialUrlPosition.length() >= 10 ? pdfTrialUrlPosition : approvalPdf;
|
|
|
taskApp.setSignPdfUrl(getHppsToHttp(approvalPdf));
|
|
|
} else if ("2".equals(type)) {
|
|
|
if (StringUtils.isNotEmpty(eVisaPdfUrl) || StringUtils.isNotEmpty(pdfUrl)) {
|
|
|
@@ -400,7 +409,6 @@ public class EVDataServiceImpl implements EVDataService {
|
|
|
} else if (taskApp.getApprovalType() == 5) {
|
|
|
map = this.jdbcTemplate.queryForMap("select * from s_interim_pay_certificate where is_deleted=0 and contract_period_id = " + taskApp.getFormDataId());
|
|
|
taskApp.setSignPdfUrl(map.get("raw_url") + "");
|
|
|
-
|
|
|
} else if (taskApp.getApprovalType() == 6 || taskApp.getApprovalType() == 7) {
|
|
|
map = this.jdbcTemplate.queryForMap("select * from s_material_start_statement where is_deleted=0 and meter_period_id = " + taskApp.getFormDataId());
|
|
|
taskApp.setSignPdfUrl(map.get("raw_url") + "");
|
|
|
@@ -453,118 +461,129 @@ public class EVDataServiceImpl implements EVDataService {
|
|
|
// 添加电签策略 -- 东方中讯
|
|
|
public List<Map<String, Object>> getStrategyListByDFZX(TaskSignInfoVO task, String ids) {
|
|
|
|
|
|
- String sqlinfo = " SELECT * from ( SELECT a.id as keyWord,a.project_id,a.pyzbx ,a.pyzby,(SELECT acc_code from blade_user where id='" + task.getUserId() + "' and is_deleted=0 ) as sealId from m_textdict_info a where a.type =2 and a.id in (" + ids + ") and sig_role_id in (SELECT DISTINCT c.role_id from m_project_assignment_user c where c.contract_id=" + task.getContractId() + " and user_id=" + task.getUserId() + " and c.is_deleted=0 ) ) x where x.sealId is not null ";
|
|
|
- if (task.getSigType() == 2) {
|
|
|
- sqlinfo = "SELECT a.id as keyWord,a.pyzbx,a.pyzby,b.certificate_number as sealId from m_textdict_info a ,m_sign_pfx_file b where a.sig_role_id = b.pfx_type and b.project_contract_role like '%" + task.getContractId() + "%' and a.is_deleted=0 and b.is_deleted=0 and a.type=6 and a.id in(" + ids + ")";
|
|
|
- System.out.println("东方中讯--签章--" + sqlinfo);
|
|
|
- } else {
|
|
|
- System.out.println("东方中讯--签字--" + sqlinfo);
|
|
|
- }
|
|
|
-
|
|
|
- List<Map<String, Object>> maps2 = jdbcTemplate.queryForList(sqlinfo);
|
|
|
+ String[] strArray = Func.toStrArray(task.getUserId());
|
|
|
+ String[] userNames = Func.toStrArray(task.getNickName());
|
|
|
List<Map<String, Object>> maps = new ArrayList<>();
|
|
|
- Map<String, List<Map<String, Object>>> peopleByAge = maps2.stream()
|
|
|
- .collect(Collectors.groupingBy(hada -> (Func.toStr(hada.get("keyWord")))));
|
|
|
-
|
|
|
- for (String keyId : peopleByAge.keySet()) {
|
|
|
- int exId = 0;
|
|
|
- List<Map<String, Object>> keyList = peopleByAge.get(keyId);
|
|
|
- if (keyList != null && keyList.size() == 1) {
|
|
|
- maps.addAll(keyList);
|
|
|
- exId = 1;
|
|
|
- } else if (keyList != null && keyList.size() >= 2) {
|
|
|
- for (Map<String, Object> datax : keyList) {
|
|
|
- if ((datax.get("project_id") + "").equals(task.getProjectId())) {
|
|
|
- maps.add(datax);
|
|
|
+ if(strArray!=null && strArray.length>0) {
|
|
|
+ for (int i = 0; i < strArray.length; i++) {
|
|
|
+ String sqlinfo = " SELECT * from ( SELECT a.id as keyWord,a.project_id,a.pyzbx ,a.pyzby,(SELECT acc_code from blade_user where id='" + strArray[i] + "' and is_deleted=0 ) as sealId from m_textdict_info a where a.type =2 and a.id in (" + ids + ") and sig_role_id in (SELECT DISTINCT c.role_id from m_project_assignment_user c where c.contract_id=" + task.getContractId() + " and user_id=" + strArray[i] + " and c.is_deleted=0 ) ) x where x.sealId is not null ";
|
|
|
+ if (task.getSigType() == 2) {
|
|
|
+ sqlinfo = "SELECT a.id as keyWord,a.pyzbx,a.pyzby,b.certificate_number as sealId from m_textdict_info a ,m_sign_pfx_file b where a.sig_role_id = b.pfx_type and b.project_contract_role like '%" + task.getContractId() + "%' and a.is_deleted=0 and b.is_deleted=0 and a.type=6 and a.id in(" + ids + ")";
|
|
|
+ System.out.println("东方中讯--签章--" + sqlinfo);
|
|
|
+ } else {
|
|
|
+ System.out.println("东方中讯--签字--" + sqlinfo);
|
|
|
+ }
|
|
|
+ List<Map<String, Object>> maps2 = jdbcTemplate.queryForList(sqlinfo);
|
|
|
+ Map<String, List<Map<String, Object>>> peopleByAge = maps2.stream()
|
|
|
+ .collect(Collectors.groupingBy(hada -> (Func.toStr(hada.get("keyWord")))));
|
|
|
+ for (String keyId : peopleByAge.keySet()) {
|
|
|
+ int exId = 0;
|
|
|
+ List<Map<String, Object>> keyList = peopleByAge.get(keyId);
|
|
|
+ if (keyList != null && keyList.size() == 1) {
|
|
|
+ maps.addAll(keyList);
|
|
|
exId = 1;
|
|
|
+ } else if (keyList != null && keyList.size() >= 2) {
|
|
|
+ for (Map<String, Object> datax : keyList) {
|
|
|
+ if ((datax.get("project_id") + "").equals(task.getProjectId())) {
|
|
|
+ maps.add(datax);
|
|
|
+ exId = 1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (exId == 0) {
|
|
|
+ maps.add(keyList.get(0));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if (exId == 0) {
|
|
|
- maps.add(keyList.get(0));
|
|
|
- }
|
|
|
}
|
|
|
return maps;
|
|
|
}
|
|
|
|
|
|
// 添加电签策略 -- 安心签
|
|
|
public List<SealStrategyVO> getStrategyListByAXQ(TaskSignInfoVO task, String ids) {
|
|
|
+ // 获取任务所有的人签字的信息
|
|
|
+ String[] strArray = Func.toStrArray(task.getUserId());
|
|
|
+ String[] userNames = Func.toStrArray(task.getNickName());
|
|
|
List<SealStrategyVO> sealStrategyVOS = new ArrayList<>();
|
|
|
- String sqlinfo = "SELECT * from ( SELECT DISTINCT a.id,a.pyzbx ,a.pyzby,a.project_id,(SELECT signature_file_url from m_sign_pfx_file where is_register=1 and certificate_user_id='" + task.getUserId() + "' and is_deleted=0 ) as signature_file_url, (SELECT wide from m_sign_pfx_file where is_register=1 and certificate_user_id='" + task.getUserId() + "' and is_deleted=0 ) as wide ,(SELECT high from m_sign_pfx_file where is_register=1 and certificate_user_id='" + task.getUserId() + "' and is_deleted=0 ) as high from m_textdict_info a where a.type =2 and a.id in (" + ids + ") and sig_role_id in (SELECT DISTINCT c.role_id from m_project_assignment_user c where c.contract_id=" + task.getContractId() + " and user_id=" + task.getUserId() + " and c.is_deleted=0 ) ) x where x.signature_file_url is not null and x.project_id=" + task.getProjectId() + " ";
|
|
|
- if (task.getSigType() == 2) {
|
|
|
- sqlinfo = "SELECT a.id,a.pyzbx,a.pyzby,b.signature_file_url,b.id as sfId,a.project_id,b.certificate_password,b.certificate_user_name,b.certificate_number ,b.wide,b.high from m_textdict_info a ,m_sign_pfx_file b where a.sig_role_id = b.pfx_type and b.project_contract_role like '%" + task.getContractId() + "%' and a.is_deleted=0 and b.is_deleted=0 and a.type=6 and a.id in(" + ids + ") and a.project_id=" + task.getProjectId() + "";
|
|
|
- System.out.println("安心签--签章--=" + sqlinfo);
|
|
|
- } else {
|
|
|
- System.out.println("安心签--签字--=" + sqlinfo);
|
|
|
- }
|
|
|
- List<Map<String, Object>> maps2 = jdbcTemplate.queryForList(sqlinfo);
|
|
|
- if (maps2 == null && maps2.size() <= 0) {
|
|
|
- return sealStrategyVOS;
|
|
|
- }
|
|
|
|
|
|
- List<Map<String, Object>> maps = new ArrayList<>();
|
|
|
- Map<String, List<Map<String, Object>>> peopleByAge = maps2.stream()
|
|
|
- .collect(Collectors.groupingBy(hada -> (Func.toStr(hada.get("id")))));
|
|
|
-
|
|
|
- for (String keyId : peopleByAge.keySet()) {
|
|
|
- int exId = 0;
|
|
|
- List<Map<String, Object>> keyList = peopleByAge.get(keyId);
|
|
|
- if (keyList != null && keyList.size() == 1) {
|
|
|
- maps.addAll(keyList);
|
|
|
- exId = 1;
|
|
|
- } else if (keyList != null && keyList.size() >= 2) {
|
|
|
- for (Map<String, Object> datax : keyList) {
|
|
|
- if ((datax.get("project_id") + "").equals(task.getProjectId())) {
|
|
|
- maps.add(datax);
|
|
|
- exId = 1;
|
|
|
- }
|
|
|
+ if(strArray!=null && strArray.length>0){
|
|
|
+ for (int i =0 ;i < strArray.length;i++) {
|
|
|
+ String userId =strArray[i];
|
|
|
+ String sqlinfo = "SELECT * from ( SELECT DISTINCT a.id,a.pyzbx ,a.pyzby,a.project_id,(SELECT signature_file_url from m_sign_pfx_file where is_register=1 and certificate_user_id='" + userId + "' and is_deleted=0 ) as signature_file_url, (SELECT wide from m_sign_pfx_file where is_register=1 and certificate_user_id='" + userId + "' and is_deleted=0 ) as wide ,(SELECT high from m_sign_pfx_file where is_register=1 and certificate_user_id='" + userId + "' and is_deleted=0 ) as high from m_textdict_info a where a.type =2 and a.id in (" + ids + ") and sig_role_id in (SELECT DISTINCT c.role_id from m_project_assignment_user c where c.contract_id=" + task.getContractId() + " and user_id=" + userId + " and c.is_deleted=0 ) ) x where x.signature_file_url is not null ";
|
|
|
+ if (task.getSigType() == 2) {
|
|
|
+ sqlinfo = "SELECT a.id,a.pyzbx,a.pyzby,b.signature_file_url,b.id as sfId,a.project_id,b.certificate_password,b.certificate_user_name,b.certificate_number ,b.wide,b.high from m_textdict_info a ,m_sign_pfx_file b where a.sig_role_id = b.pfx_type and b.project_contract_role like '%" + task.getContractId() + "%' and a.is_deleted=0 and b.is_deleted=0 and a.type=6 and a.id in(" + ids + ") ";
|
|
|
+ System.out.println("安心签--签章--=" + sqlinfo);
|
|
|
+ } else {
|
|
|
+ System.out.println("安心签--签字--=" + sqlinfo);
|
|
|
}
|
|
|
- }
|
|
|
- if (exId == 0) {
|
|
|
- maps.add(keyList.get(0));
|
|
|
- }
|
|
|
- }
|
|
|
+ List<Map<String, Object>> maps2 = jdbcTemplate.queryForList(sqlinfo);
|
|
|
+
|
|
|
+ if (maps2 != null && maps2.size() > 0) {
|
|
|
+ List<Map<String, Object>> maps = new ArrayList<>();
|
|
|
+ Map<String, List<Map<String, Object>>> peopleByAge = maps2.stream()
|
|
|
+ .collect(Collectors.groupingBy(hada -> (Func.toStr(hada.get("id")))));
|
|
|
+
|
|
|
+ for (String keyId : peopleByAge.keySet()) {
|
|
|
+ int exId = 0;
|
|
|
+ List<Map<String, Object>> keyList = peopleByAge.get(keyId);
|
|
|
+ if (keyList != null && keyList.size() == 1) {
|
|
|
+ maps.addAll(keyList);
|
|
|
+ exId = 1;
|
|
|
+ } else if (keyList != null && keyList.size() >= 2) {
|
|
|
+ for (Map<String, Object> datax : keyList) {
|
|
|
+ if ((datax.get("project_id") + "").equals(task.getProjectId())) {
|
|
|
+ maps.add(datax);
|
|
|
+ exId = 1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (exId == 0) {
|
|
|
+ maps.add(keyList.get(0));
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- if (maps == null || maps.size() <= 0) {
|
|
|
- return sealStrategyVOS;
|
|
|
- }
|
|
|
- //准备签章策略
|
|
|
-
|
|
|
- for (Map<String, Object> eVisaConfig : maps) {
|
|
|
- //设置签章策略
|
|
|
- SealStrategyVO vo = new SealStrategyVO();
|
|
|
- if (task.getSigType() == 1) {
|
|
|
- String userId = task.getUserId() + "";
|
|
|
- vo.setSealCode(EVisaConstant.SIGN_SEAL_CODE + userId);
|
|
|
- if (userId.length() <= EVisaConstant.USER_ID_SUB) {
|
|
|
- vo.setSealPassword(task.getUserId().toString());
|
|
|
- } else {
|
|
|
- vo.setSealPassword(task.getUserId().toString().substring(0, EVisaConstant.USER_ID_SUB));
|
|
|
+ if (maps == null || maps.size() <= 0) {
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
+ //准备签章策略
|
|
|
+ for (Map<String, Object> eVisaConfig : maps) {
|
|
|
+ //设置签章策略
|
|
|
+ SealStrategyVO vo = new SealStrategyVO();
|
|
|
+ if (task.getSigType() == 1) {
|
|
|
+ vo.setSealCode(EVisaConstant.SIGN_SEAL_CODE + userId);
|
|
|
+ if (userId.length() <= EVisaConstant.USER_ID_SUB) {
|
|
|
+ vo.setSealPassword(userId.toString());
|
|
|
+ } else {
|
|
|
+ vo.setSealPassword(userId.substring(0, EVisaConstant.USER_ID_SUB));
|
|
|
+ }
|
|
|
+ vo.setSealPerson(userNames[i]);
|
|
|
+ //设置签字文件
|
|
|
+ vo.setImageUrl(eVisaConfig.get("signature_file_url") + "");
|
|
|
+ vo.setSealType("3");
|
|
|
+ vo.setKeyword(eVisaConfig.get("id") + "");
|
|
|
+ vo.setOffSetX(eVisaConfig.get("pyzbx") + "");
|
|
|
+ vo.setOffSetY(eVisaConfig.get("pyzby") + "");
|
|
|
+ vo.setHeight(eVisaConfig.get("high") + "");
|
|
|
+ vo.setWidth(eVisaConfig.get("wide") + "");
|
|
|
+ } else if (task.getSigType() == 2) {
|
|
|
+ vo.setSealCode(EVisaConstant.SIGN_SEAL_CODE + eVisaConfig.get("sfId"));
|
|
|
+ vo.setSealPassword(eVisaConfig.get("certificate_password") + "");
|
|
|
+ vo.setSealPerson(eVisaConfig.get("certificate_user_name") + "" + System.currentTimeMillis());
|
|
|
+ //设置签字文件
|
|
|
+ vo.setImageUrl(eVisaConfig.get("signature_file_url") + "");
|
|
|
+ vo.setSealType("3");
|
|
|
+ vo.setCompanySeal(true);
|
|
|
+ vo.setKeyword(eVisaConfig.get("id") + "");
|
|
|
+ vo.setOffSetX(eVisaConfig.get("pyzbx") + "");
|
|
|
+ vo.setOffSetY(eVisaConfig.get("pyzby") + "");
|
|
|
+ vo.setHeight(eVisaConfig.get("high") + "");
|
|
|
+ vo.setWidth(eVisaConfig.get("wide") + "");
|
|
|
+ }
|
|
|
+ sealStrategyVOS.add(vo);
|
|
|
+ }
|
|
|
}
|
|
|
- vo.setSealPerson(task.getNickName());
|
|
|
- //设置签字文件
|
|
|
- vo.setImageUrl(eVisaConfig.get("signature_file_url") + "");
|
|
|
- vo.setSealType("3");
|
|
|
- vo.setKeyword(eVisaConfig.get("id") + "");
|
|
|
- vo.setOffSetX(eVisaConfig.get("pyzbx") + "");
|
|
|
- vo.setOffSetY(eVisaConfig.get("pyzby") + "");
|
|
|
- vo.setHeight(eVisaConfig.get("high") + "");
|
|
|
- vo.setWidth(eVisaConfig.get("wide") + "");
|
|
|
- } else if (task.getSigType() == 2) {
|
|
|
- vo.setSealCode(EVisaConstant.SIGN_SEAL_CODE + eVisaConfig.get("sfId"));
|
|
|
- vo.setSealPassword(eVisaConfig.get("certificate_password") + "");
|
|
|
- vo.setSealPerson(eVisaConfig.get("certificate_user_name") + "" + System.currentTimeMillis());
|
|
|
- //设置签字文件
|
|
|
- vo.setImageUrl(eVisaConfig.get("signature_file_url") + "");
|
|
|
- vo.setSealType("3");
|
|
|
- vo.setCompanySeal(true);
|
|
|
- vo.setKeyword(eVisaConfig.get("id") + "");
|
|
|
- vo.setOffSetX(eVisaConfig.get("pyzbx") + "");
|
|
|
- vo.setOffSetY(eVisaConfig.get("pyzby") + "");
|
|
|
- vo.setHeight(eVisaConfig.get("high") + "");
|
|
|
- vo.setWidth(eVisaConfig.get("wide") + "");
|
|
|
}
|
|
|
- sealStrategyVOS.add(vo);
|
|
|
}
|
|
|
return sealStrategyVOS;
|
|
|
}
|
|
|
@@ -714,9 +733,11 @@ public class EVDataServiceImpl implements EVDataService {
|
|
|
return;
|
|
|
} else {
|
|
|
BladeFile bladeFile = this.newIOSSClient.uploadFile(SnowFlakeUtil.getId() + ".pdf", fileUrl);
|
|
|
+ System.out.println("OSS上传=" + bladeFile);
|
|
|
if (bladeFile != null) {
|
|
|
taskApp.setLastFilePdfUrl(bladeFile.getLink());
|
|
|
taskApp.setSignSmg("电签成功");
|
|
|
+
|
|
|
} else {
|
|
|
taskApp.setSigState(2);
|
|
|
taskApp.setSignSmg("上传OSS失败" + fileUrl);
|
