Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -3090,6 +3090,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 if (!s.startsWith("*")) {
                     s = "*" + s;
                     addBatchNumberList.set(i, s);
+                    batchNumberList.set(batchNumberList.indexOf(addBatchNumber), s);
                 }
             }
         }

cx-question/cx-question-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SrmIssuesListServiceImpl.java

@@ -248,7 +248,7 @@ public class SrmIssuesListServiceImpl extends ServiceImpl<SrmIssuesListDao, SrmI
         for(SrmIssuesListVo vo:list){
             taskname = vo.getTaskname();
             try {
-                if (vo.getId().equals("1f8feeeae3e041f5a79727730af9f30a")){
+
                     //2.条件判断节点跟超时时间截取数据
                     if (taskname.equals("问题登记人") && System.currentTimeMillis()- vo.getCreatedate().getTime() > twentyFourHoursInMillis){
                         vo.setNodetime(vo.getCreatedate());
@@ -268,7 +268,6 @@ public class SrmIssuesListServiceImpl extends ServiceImpl<SrmIssuesListDao, SrmI
                         addNotifyAnnounce(vo,userEmailList,keyMap, issTaskkey);
                     }
                     f=false;
-                }
 
             }catch (Exception e){
                 log.error(" 节点 {} 问题编号 {} 出现问题 {} ",taskname,vo.getQuestionno(),e.getMessage());
@@ -400,7 +399,7 @@ public class SrmIssuesListServiceImpl extends ServiceImpl<SrmIssuesListDao, SrmI
             if (vo.getTaskname().equals("问题登记人")){
                 srmIssuesListVo.setReminder("、【"+vo.getQuestionno()+"】【"+vo.getQuestiontitle()+"】已创建，请及时提交流程！");
             }else {
-                srmIssuesListVo.setReminder("、【"+vo.getQuestionno()+"】【"+vo.getQuestiontitle()+"】已创建，请尽快完成审批！");
+                srmIssuesListVo.setReminder("、【"+vo.getQuestionno()+"】【"+vo.getQuestiontitle()+"】已提交审批，请尽快完成审批！");
             }
             srmIssuesListVo.setHour(vo.getHour());
             userEmailList.add(srmIssuesListVo);

cx-question/cx-question-server/src/main/java/com/rongwei/businessServer/controller/SrmIssuesListController.java

@@ -33,7 +33,7 @@ public class SrmIssuesListController {
      * 生产问题审批超时提醒
      * @return
      */
-  //  @Scheduled(cron = "0 0/10 * * * ? ")
+    @Scheduled(cron = "0 0/10 * * * ? ")
     @PostMapping("/approvalTimeoutReminder")
     public R batchSavePlansTiming(){
         R r = srmIssuesListService.approvalTimeoutReminder();