|
|
@@ -127,11 +127,11 @@ public class RabbitSnapshotMessageQueueConsumer {
|
|
|
// 文件批量新增修订记录表 需要根据子表(t_wjxzxdjlb)生成各自的快照 流程绑定的是主表(t_wjxdzb)
|
|
|
// 生成的快照文件名 取文件修订子表 xiu_ding_wen_jian 字段值 ,若该字段值为空则取 wen_jian_ming_che 字段
|
|
|
if ("Process_1ek5omy_2".equals(procDefKey)){
|
|
|
- String fileSql = "select id_,parent_id_,xiu_ding_wen_jian,wen_jian_ming_che from t_wjxzxdjlb where parent_id_ = '"+bizKey+"'";
|
|
|
+ String fileSql = "select id_,ji_lu_bian_hao_ from t_wjxzxdjlb where parent_id_ = '"+bizKey+"'";
|
|
|
List<Map<String,Object>> list = (List<Map<String, Object>>) commonDao.query(fileSql);
|
|
|
if (BeanUtils.isNotEmpty(list)){
|
|
|
for (Map<String,Object> map : list){
|
|
|
- procDefName = (String) (BeanUtils.isNotEmpty(map.get("xiu_ding_wen_jian"))?map.get("xiu_ding_wen_jian"):map.get("wen_jian_ming_che"));
|
|
|
+ procDefName = procDefName + (BeanUtils.isEmpty(map.get("ji_lu_bian_hao_"))?"":map.get("ji_lu_bian_hao_"));
|
|
|
bizKey = (String) map.get("id_");
|
|
|
this.updateKuaiZhao(procDefKey,procDefName,bizKey,baseUrl,reportPath,org);
|
|
|
}
|
|
|
@@ -147,6 +147,9 @@ public class RabbitSnapshotMessageQueueConsumer {
|
|
|
private void updateKuaiZhao(String procDefKey,String procDefName,String bizKey,String baseUrl,String reportPath,String org){
|
|
|
String url = baseUrl + reportPath + "&print=1&srcType=file¶mString=id_%3D"+bizKey+"&org_="+org;
|
|
|
String name = procDefName + new SimpleDateFormat("yyyyMMddHHmm").format(new Date());
|
|
|
+ if (procDefKey.equals("Process_1ek5omy_2")){
|
|
|
+ name = procDefName;
|
|
|
+ }
|
|
|
APIResult<AttachmentPo> result = uploadFile.runQianUpload(url , name , StringPool.FileType.Office.PDF );
|
|
|
Map<String, Object> defMap = commonDao.queryOne("select BO_CODE_ from ibps_bpm_def where DEF_KEY_ = '"+procDefKey+"' ");
|
|
|
if (BeanUtils.isNotEmpty(defMap)) {
|