Procházet zdrojové kódy

[bug-2594]管理评审编制时间小于管理评审会议5天时,材料准备时间不合理

szjbdgzl před 1 rokem
rodič
revize
e9f5028680

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

@@ -225,7 +225,8 @@ public class AuditServiceImpl implements AuditService {
     @Override
     public void NoticeByOneMonth(){
 
-        String sql = "select id_,ri_qi_,bian_zhi_bu_men_,di_dian_,date_format(date_sub(ri_qi_, interval 5 day),'%Y-%m-%d') as advance,now() as current_date_,YEAR(ri_qi_) as year_ from t_gglpsjhx " +
+        String sql = "select id_,ri_qi_,bian_zhi_bu_men_,di_dian_,date_format(date_sub(ri_qi_, interval 5 day),'%Y-%m-%d') as advance,now() as current_date_,YEAR(ri_qi_) as year_," +
+                "IF(date_sub(ri_qi_,interval 5 day)>=CURRENT_DATE,'1','0') as type_ from t_gglpsjhx " +
                 " where shi_fou_guo_shen_='已完成' and  (date_format(ri_qi_,'%Y-%m-%d')<=date_format(date_add(now(), interval 1 month),'%Y-%m-%d')" +
                 " and date_format(ri_qi_,'%Y-%m-%d')>=CURRENT_DATE ) ";
         List<Map<String, Object>> list = (List<Map<String, Object>>) commonDao.query(sql);
@@ -237,10 +238,14 @@ public class AuditServiceImpl implements AuditService {
                 if (BeanUtils.isEmpty(map)){
                     String name = getJykzr(glps.get("di_dian_").toString());
                     String time = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"));
+                    String advance = glps.get("advance")+"前";
+                    if (glps.get("type_").toString().equals("0")){
+                        advance = "今天之内";
+                    }
                     String content = "<p style=\"font-weight: 600; font-size: 24px; text-align: center;\"> " +
                             "<strong>关于"+glps.get("year_")+"年度管理评审的通知</strong> </p > <p style=\"margin: 16px 0 10px;\">科室管理层及各专业组:</p > " +
                             "<p style=\"text-indent: 2em; line-height: 2;\">经检验科管理层商议决定,计划于"+glps.get("ri_qi_")+"召开质量管理体系运行的管理评审会议," +
-                            "请各职能组别和专业组负责人按照日程计划表,编制管理评审输入汇报材料,并提前5个工作日,于"+glps.get("advance")+"前发送给质量负责人核实整理后提交检验科主任," +
+                            "请各职能组别和专业组负责人按照日程计划表,编制管理评审输入汇报材料,于"+advance+"发送给质量负责人核实整理后提交检验科主任," +
                             "如有异议,可在3个工作日内提出。</p > <p style=\"margin: 10px 0; text-indent: 2em;\">特此通知</p > <p style=\"margin: 10px 0;" +
                             " text-align: right;\">科室主任:"+name+"</p > <p style=\"text-align: right;\">"+time+"</p >";