认可申报推送流程接口调整走定时任务启流程

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/business/dto/ApprovalDTO.java

@@ -24,6 +24,7 @@ public class ApprovalDTO {
     private String wanChengQiXian;
     private String jiHuaZhuBiaoId;
     private String jiHuaZiBiaoId;
+    private String shiFouTuiSong;
 
     public String getId() {
         return id;
@@ -200,4 +201,12 @@ public class ApprovalDTO {
     public void setJiHuaZiBiaoId(String jiHuaZiBiaoId) {
         this.jiHuaZiBiaoId = jiHuaZiBiaoId;
     }
+
+    public String getShiFouTuiSong() {
+        return shiFouTuiSong;
+    }
+
+    public void setShiFouTuiSong(String shiFouTuiSong) {
+        this.shiFouTuiSong = shiFouTuiSong;
+    }
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/business/service/impl/AuditServiceImpl.java

@@ -60,8 +60,8 @@ public class AuditServiceImpl implements AuditService {
     @Resource
     private Approval approval;
 
-    @Resource
-    private IBpmInstService iBpmInstService;
+//    @Resource
+//    private IBpmInstService iBpmInstService;
 
     @Override
     public void personnelTrain(String[] records) throws Exception {
@@ -614,6 +614,7 @@ public class AuditServiceImpl implements AuditService {
                     dto.setJiHuaZiBiaoId(item.get("id_").toString());
                     //itemMap.put("shi_fou_guo_shen_","待编制");
                     dto.setShiFouGuoShen("待编制");
+                    dto.setShiFouTuiSong("0");
                     approval.add(dto);
                    // commonDao.execute(buildInsertSql(itemMap, "t_rksbclb"));
                 }
@@ -642,14 +643,14 @@ public class AuditServiceImpl implements AuditService {
 
     @Transactional
     public void startBpm(List<String> idArr, List<String> oldIds) {
-//        IBpmInstService bpmInstService = AppUtil.getBean(IBpmInstService.class);
-//        if (StringUtils.isBlank(ContextUtil.getCurrentAccessToken())) {
-//            ITenantTokenService tenantTokenService = AppUtil.getBean(ITenantTokenService.class);
-//            String accessToken = tenantTokenService.getAccessToken();
-//            ContextUtil.setCurrentAccessToken(accessToken);
-//        }
+        IBpmInstService bpmInstService = AppUtil.getBean(IBpmInstService.class);
+        if (StringUtils.isBlank(ContextUtil.getCurrentAccessToken())) {
+            ITenantTokenService tenantTokenService = AppUtil.getBean(ITenantTokenService.class);
+            String accessToken = tenantTokenService.getAccessToken();
+            ContextUtil.setCurrentAccessToken(accessToken);
+        }
         String[] strings = idArr.toArray(new String[0]);
-        APIResult<String> apiResult = iBpmInstService.startFlowFromList(strings, "rksbclb", "Process_0d1f058");
+        APIResult<String> apiResult = bpmInstService.startFlowFromList(strings, "rksbclb", "Process_0d1f058");
         int state = apiResult.getState();
         if("200".equals(String.valueOf(state))){
             //已经推送过流程的数据防止重复推送，yi_tui_song_=1 表示数据是yi_tui_song_推送的数据

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/klimsibps/mapping/ApprovalMapper.xml

@@ -26,10 +26,11 @@
         <result property="wanChengQiXian" column="wan_cheng_qi_xian" jdbcType="VARCHAR"/>
         <result property="jiHuaZhuBiaoId" column="ji_hua_zhu_biao_i" jdbcType="VARCHAR"/>
         <result property="jiHuaZiBiaoId" column="ji_hua_zi_biao_id" jdbcType="VARCHAR"/>
+        <result property="shiFouTuiSong" column="shi_fou_tui_song_" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="columns">
-        id_,create_by_,update_by_,shi_fou_guo_shen_,create_time_,di_dian_,bian_zhi_ren_,bian_zhi_bu_men_,bian_zhi_shi_jian,ping_shen_lei_xin,shen_bao_shi_jian,ping_shen_shi_jia,nian_du_,pai_xu_hao_,wen_jian_ming_che,wen_jian_shuo_min,tian_xie_shuo_min,zhu_yi_shi_xiang_,fu_ze_ren_,wan_cheng_qi_xian,ji_hua_zhu_biao_i,ji_hua_zi_biao_id
+        id_,create_by_,update_by_,shi_fou_guo_shen_,create_time_,di_dian_,bian_zhi_ren_,bian_zhi_bu_men_,bian_zhi_shi_jian,ping_shen_lei_xin,shen_bao_shi_jian,ping_shen_shi_jia,nian_du_,pai_xu_hao_,wen_jian_ming_che,wen_jian_shuo_min,tian_xie_shuo_min,zhu_yi_shi_xiang_,fu_ze_ren_,wan_cheng_qi_xian,ji_hua_zhu_biao_i,ji_hua_zi_biao_id,shi_fou_tui_song_
     </sql>
 
     <insert id="add" parameterType="com.lc.ibps.business.dto.ApprovalDTO">
@@ -40,7 +41,7 @@
         #{diDian,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{pingShenLeiXing,jdbcType=VARCHAR},
          #{shenBaoShiJian,jdbcType=VARCHAR}, #{pingShenShiJian,jdbcType=VARCHAR}, #{nianDu,jdbcType=VARCHAR}, #{paiXuHao,jdbcType=VARCHAR}, #{wenJianMingCheng,jdbcType=VARCHAR},
          #{wenJianShuoMing,jdbcType=VARCHAR}, #{tianXieShuoMing,jdbcType=VARCHAR}, #{zhuYiShiXiang,jdbcType=VARCHAR}, #{fuZeRen,jdbcType=VARCHAR}, #{wanChengQiXian,jdbcType=VARCHAR},
-         #{jiHuaZhuBiaoId,jdbcType=VARCHAR}, #{jiHuaZiBiaoId,jdbcType=VARCHAR})
+         #{jiHuaZhuBiaoId,jdbcType=VARCHAR}, #{jiHuaZiBiaoId,jdbcType=VARCHAR}, #{shiFouTuiSong,jdbcType=VARCHAR})
     </insert>
 
 

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

@@ -3,11 +3,17 @@ package com.lc.ibps.platform.plan.job;
 import com.lc.ibps.base.core.util.AppUtil;
 import com.lc.ibps.base.core.util.Collections;
 import com.lc.ibps.base.framework.table.ICommonDao;
+import com.lc.ibps.base.saas.token.ITenantTokenService;
+import com.lc.ibps.base.web.context.ContextUtil;
+import com.lc.ibps.bpmn.api.IBpmInstService;
+import com.lc.ibps.cloud.entity.APIResult;
+import org.apache.commons.lang3.StringUtils;
 import org.quartz.JobExecutionContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.time.Year;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -19,17 +25,15 @@ public class ApprovalDeclarationJob  extends AbstractJob{
 
     @Override
     public void executeJob(JobExecutionContext context) throws Exception {
-        //查询当前年度的计划子表中带推送的数据
+        //查询材料表中带推送的数据
         List<Map<String, Object>> all = selectAll();
 
-        //根据时间筛选今天需要推送的数据（待明确需求后补充补充）
-
+        startBpm(all);
     }
 
     public List<Map<String,Object>> selectAll(){
         //查询当前年度已完成的计划对应的子表的未推送的数据
-        String sql = " select t_rksbjhbzb.*,t_rksbjhb.id_ as zhuId from t_rksbjhbzb join t_rksbjhb on t_rksbjhbzb.parent_id_ = t_rksbjhb.id_ where t_rksbjhb.nian_du_ = '"
-                + CURRENT_YEAR +"' and t_rksbjhb.shi_fou_guo_shen_ = '已完成' and t_rksbjhbzb.yi_tui_song_ <> '1'";
+        String sql = " select * from t_rksbclb where shi_fou_tui_song_ = '0' ";
         List<Map<String,Object>> query = (List<Map<String,Object>>) commonDao.query(sql);
         if(Collections.isNotEmpty(query)){
             logger.warn("查询到待推送的认可计划数据：",query);
@@ -37,4 +41,27 @@ public class ApprovalDeclarationJob  extends AbstractJob{
         }
         return null;
     }
+
+    public void startBpm(List<Map<String,Object>> all){
+        if(Collections.isNotEmpty(all)){
+            IBpmInstService bpmInstService = AppUtil.getBean(IBpmInstService.class);
+            if (StringUtils.isBlank(ContextUtil.getCurrentAccessToken())) {
+                ITenantTokenService tenantTokenService = AppUtil.getBean(ITenantTokenService.class);
+                String accessToken = tenantTokenService.getAccessToken();
+                ContextUtil.setCurrentAccessToken(accessToken);
+            }
+            List<String> list = new ArrayList<>();
+            for (Map<String,Object> item : all) {
+                list.add(item.get("id_").toString());
+            }
+            String join = String.join(",", list);
+            String[] strings = list.toArray(new String[0]);
+            APIResult<String> apiResult = bpmInstService.startFlowFromList(strings, "rksbclb", "Process_0d1f058");
+            if("200".equals(String.valueOf(apiResult.getState()))){
+                String upSql = "UPDATE t_rksbclb SET shi_fou_tui_song_ = '1' where find_in_set(id_,'"+ join + "') ";
+                commonDao.execute(upSql);
+            }
+        }
+
+    }
 }