Merge remote-tracking branch 'origin/matser' into matser

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

@@ -51,10 +51,10 @@ public class AuditServiceImpl implements AuditService {
         String sql = "select p.id_,p.bian_zhi_ren_,e.name_,p.bian_zhi_bu_men_,d.name_ as dept_name_,p.pei_xun_nei_rong_,p.shi_fou_guo_shen_," +
                 "date_format(p.pei_xun_shi_jian_,'%%Y-%%m-%%d') pei_xun_shi_jian_,date_format(p.pei_xun_jie_shu_s,'%%Y-%%m-%%d')  " +
                 " pei_xun_jie_shu_s,p.pei_xun_ren_yuan_,p.pei_xun_di_dian_,p.pei_xun_lao_shi_,p.di_dian_," +
-                "IF(pei_xun_shi_jian_<=DATE_FORMAT(date_add(now(), interval 1 week),'%%Y-%%m-%%d'),'1','0') as type_ from t_rypxcjb p " +
+                "IF(pei_xun_shi_jian_<=DATE_FORMAT(date_add(now(), interval 1 week),'%%Y-%%m-%%d'),'1','0') as type_,p.tui_song_biao_zhi from t_rypxcjb p " +
                 "left join ibps_party_employee e on e.id_=p.bian_zhi_ren_ " +
                 "left join ibps_party_position d on d.id_=p.bian_zhi_bu_men_ " +
-                "where p.id_ in(%s)";
+                "where p.id_ in(%s) and (p.tui_song_biao_zhi !='yes' or p.tui_song_biao_zhi is null)";
         sql = String.format(sql, String.join(",", records));
         List<Map<String, Object>> pxList = (List<Map<String, Object>>) commonDao.query(sql);
 
@@ -125,6 +125,8 @@ public class AuditServiceImpl implements AuditService {
                     newsPo.setKey(id);
                     newsMgrService.save(newsPo);
                     log.warn("培训相关的信息填写完整，发布日历和公告，培训记录ID={}",id);
+                    //推送成功后修改推送标志为yes
+                    commonDao.execute("update t_rypxcjb set tui_song_biao_zhi='yes' where id_= '"+id+"'");
                 }
             }
         }
@@ -136,10 +138,10 @@ public class AuditServiceImpl implements AuditService {
         String sql = "select p.id_,p.bian_zhi_ren_,e.name_,p.bian_zhi_bu_men_,d.name_ as dept_name_,p.pei_xun_nei_rong_,p.pei_xun_zhuang_ta," +
                 "date_format(p.pei_xun_shi_jian_,'%%Y-%%m-%%d') pei_xun_shi_jian_,date_format(p.pei_xun_jie_shu_s,'%%Y-%%m-%%d')  " +
                 " pei_xun_jie_shu_s,p.pei_xun_ren_yuan_,p.pei_xun_di_dian_,p.pei_xun_lao_shi_,p.di_dian_," +
-                "IF(pei_xun_shi_jian_<=DATE_FORMAT(date_add(now(), interval 1 week),'%%Y-%%m-%%d'),'1','0') as type_ from t_lhrypxjlb p " +
+                "IF(pei_xun_shi_jian_<=DATE_FORMAT(date_add(now(), interval 1 week),'%%Y-%%m-%%d'),'1','0') as type_,p.tui_song_biao_zhi from t_lhrypxjlb p " +
                 "left join ibps_party_employee e on e.id_=p.bian_zhi_ren_ " +
                 "left join ibps_party_position d on d.id_=p.bian_zhi_bu_men_ " +
-                "where p.id_ in(%s)";
+                "where p.id_ in(%s) and (p.tui_song_biao_zhi !='yes' or p.tui_song_biao_zhi is null)";
         sql = String.format(sql, String.join(",", records));
         List<Map<String, Object>> pxList = (List<Map<String, Object>>) commonDao.query(sql);
 
@@ -210,6 +212,8 @@ public class AuditServiceImpl implements AuditService {
                     newsPo.setKey(id);
                     newsMgrService.save(newsPo);
                     log.warn("培训相关的信息填写完整，发布日历和公告，培训记录ID={}",id);
+                    //推送成功后修改推送标志为yes
+                    commonDao.execute("update t_lhrypxjlb set tui_song_biao_zhi='yes' where id_= '"+id+"'");
                 }
             }
         }

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

@@ -131,7 +131,7 @@ public class PersonnelTrainJob extends BaseJob2 {
                     newsPo.setPublicItem("notices");
                     newsPo.setPublic0("Y");
                     newsPo.setStatus("publish");
-                    newsPo.setTitle("【"+ peiXunNeiRong +"】的培训通知");
+                    newsPo.setTitle("("+ peiXunNeiRong +")的培训通知-");
                     newsPo.setUserId(userId);
                     newsPo.setUserName(userName);
                     newsPo.setType(didian);