[task-1945]【后端】外部文件定期推送更新升级审批流程

ibps-provider-root/modules/provider-platform/src/main/java/com/lc/ibps/platform/plan/job/ExternalFileUpdJob.java

@@ -37,9 +37,9 @@ public class ExternalFileUpdJob extends AbstractJob{
             logger.info("jobDataMap=is {}.", JacksonUtil.toJsonString(dataMap.getWrappedMap()));
         }
 
-        String sql = "SELECT b.id_ as xuan_ze_wen_jian_,b.wen_jian_lei_xing,b.wen_jian_xi_lei_,b.xi_lei_id_," +
-                "b.wen_jian_bian_hao,a.xin_wen_jian_ming as wen_jian_ming_che,'修订' as cao_zuo_lei_xing_ from t_wjxxgxb a, t_wjxxb b " +
-                "WHERE a.ji_lu_id_=b.id_ and  a.shi_fou_guo_shen_ is null";
+        String sql = " SELECT b.id_,b.wen_jian_lei_xing,b.wen_jian_xi_lei_,b.xi_lei_id_,b.wen_jian_bian_hao,a.xin_wen_jian_ming,a.yuan_wen_jian_min, " +
+                " c.quan_xian_lei_xin,c.gui_dang_lu_jing_,a.wen_jian_fu_jian_ from t_wjxxgxb a, t_wjxxb b ,t_wjxzxdjlb c " +
+                " WHERE a.ji_lu_id_=b.id_ and b.shu_ju_lai_yuan_=c.id_ and  a.shi_fou_guo_shen_ is null";
 
         List<Map<String, Object>> list = (List<Map<String, Object>>) commonDao.query(sql);
 
@@ -48,14 +48,30 @@ public class ExternalFileUpdJob extends AbstractJob{
             StringBuilder zhuXuanZeWenJ = new StringBuilder();
             String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
             Map<String,Object> main = new HashMap<>();
-            for (Map<String,Object> map : list){
-                zhuXuanZeWenJ = zhuXuanZeWenJ.append(map.get("xuan_ze_wen_jian_")).append(",");
+            for (Map<String,Object> data : list){
+                String xuanZeWenJian = data.get("id_").toString();
+                String fileName = BeanUtils.isEmpty(data.get("xin_wen_jian_ming"))?data.get("yuan_wen_jian_min").toString():data.get("xin_wen_jian_ming").toString();
+                zhuXuanZeWenJ = zhuXuanZeWenJ.append(xuanZeWenJian).append(",");
 
                 // 子表一
-                map.put("parent_id_",pid);
-                map.put("id_", UniqueIdUtil.getId());
-                map.put("create_time_", time);
-                commonDao.execute(this.buildInsertSql(map,"t_wjxzxdjlb"));
+                Map<String,Object> xdjlb = new HashMap<>();
+                xdjlb.put("parent_id_",pid);
+                xdjlb.put("id_", UniqueIdUtil.getId());
+                xdjlb.put("create_time_", time);
+                xdjlb.put("cao_zuo_lei_xing_","修订");
+                xdjlb.put("xuan_ze_wen_jian_",xuanZeWenJian);
+                xdjlb.put("wen_jian_lei_xing",data.get("wen_jian_lei_xing"));
+                xdjlb.put("wen_jian_xi_lei_",data.get("wen_jian_xi_lei_"));
+                xdjlb.put("wen_jian_bian_hao",data.get("wen_jian_bian_hao"));
+                xdjlb.put("wen_jian_ming_che",fileName);
+                xdjlb.put("xiu_ding_wen_jian",fileName);
+                xdjlb.put("wen_jian_fu_jian_",data.get("wen_jian_fu_jian_"));
+                xdjlb.put("xiu_ding_fu_jian_",data.get("wen_jian_fu_jian_"));
+                xdjlb.put("xi_lei_id_",data.get("xi_lei_id_"));
+                xdjlb.put("quan_xian_lei_xin",data.get("quan_xian_lei_xin"));
+                xdjlb.put("gui_dang_lu_jing_",data.get("gui_dang_lu_jing_"));
+                xdjlb.put("shi_fou_sheng_ban", "是");
+                commonDao.execute(this.buildInsertSql(xdjlb,"t_wjxzxdjlb"));
 
                 // 子表二
                 Map<String,Object> sub = new HashMap<>();
@@ -63,9 +79,9 @@ public class ExternalFileUpdJob extends AbstractJob{
                 sub.put("create_time_", time);
                 sub.put("parent_id_",pid);
                 sub.put("bian_zhi_shi_jian",time);
-                sub.put("wen_jian_ming_che",map.get("xin_wen_jian_ming"));
-                sub.put("wen_jian_fu_jian_",map.get("xuan_ze_wen_jian_"));
-                sub.put("xiu_ding_zi_biao_",map.get("xuan_ze_wen_jian_"));
+                sub.put("wen_jian_ming_che",fileName);
+                sub.put("wen_jian_fu_jian_",data.get("wen_jian_fu_jian_"));
+                sub.put("xiu_ding_zi_biao_",data.get("xuan_ze_wen_jian_"));
                 commonDao.execute(this.buildInsertSql(sub,"t_wjxdjl"));
             }
 
@@ -91,7 +107,7 @@ public class ExternalFileUpdJob extends AbstractJob{
             main.put("id_",pid);
             main.put("create_time_", time);
             main.put("bian_zhi_ren_", bianZhiRen);
-            main.put("create_by_", bianZhiRen);
+            main.put("create_by_", "1");
             zhuXuanZeWenJ.deleteCharAt(zhuXuanZeWenJ.length() - 1);
             main.put("zhu_xuan_ze_wen_j",zhuXuanZeWenJ);
             main.put("lai_yuan_","修订");
@@ -104,7 +120,7 @@ public class ExternalFileUpdJob extends AbstractJob{
         // 文件修订流程
         startWorkflow("t_wjxdzb","wjplxd","Process_1ek5omy_2");
 
-        String sql2 = "SELECT a.id_ from t_wjxxgxb a, t_wjxxb b WHERE a.ji_lu_id_=b.id_ and  a.shi_fou_guo_shen_ is null";
+        String sql2 = "SELECT a.id_ from t_wjxxgxb a, t_wjxxb b ,t_wjxzxdjlb c WHERE a.ji_lu_id_=b.id_ and b.shu_ju_lai_yuan_=c.id_ and  a.shi_fou_guo_shen_ is null";
         List<Map<String, Object>> update = (List<Map<String, Object>>) commonDao.query(sql2);
         if(BeanUtils.isNotEmpty(update)){
             for (Map<String,Object> map : update) {