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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -315,7 +315,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 //            String contentInfo = sysUser.getUsername() + " delete " + sbStr + ",Please pay attention to check.";
             String contentInfo =content;
             //封装消息的实体类
-            SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
+            SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.READ.getValue());
             sysAnnouncementService.saveAnnouncement(sysAnnouncement);
             sendWebsocket(StringUtils.join(serialNumberList, ","), contentInfo);
         }
@@ -2149,7 +2149,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                     + href +" has been updated.";
 //            String contentInfo = sysUser.getUsername() + " add " + serialNumber + ",Please pay attention to check.";
             //封装消息的实体类
-            SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
+            SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.READ.getValue());
             sysAnnouncementService.saveAnnouncement(sysAnnouncement);
             sendWebsocket(idTemp, contentInfo);
             //飞书
@@ -3150,7 +3150,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 String contentInfo = "In the " + technologyTerritoryNameEn + " technical field you subscribed to," +sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString();
 //                String contentInfo = "In the "+category + " " + href+" you subscribed to, "+sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString();
                 //封装消息的实体类
-                SysAnnouncement sysAnnouncement = getSysAnnouncement(userList, contentInfoFei, contentInfo);
+                SysAnnouncement sysAnnouncement = getSysAnnouncement(userList, contentInfoFei, contentInfo,MessageTypeEnum.READ.getValue());
                 sysAnnouncementService.saveAnnouncement(sysAnnouncement);
                 sendWebsocket((String) map.get("id"), contentInfo);
             }
@@ -3171,7 +3171,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 content = "In the "+category + " " + serialNumber+" you subscribed to, has been modified,Please pay attention to check.";
                 String contentInfo = "In the "+category + " " + href+" you subscribed to, "+sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString();
                 //封装消息的实体类
-                SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdListUpdate, content, contentInfo);
+                SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdListUpdate, content, contentInfo,MessageTypeEnum.READ.getValue());
                 sysAnnouncementService.saveAnnouncement(sysAnnouncement);
                 sendWebsocket((String) map.get("id"), contentInfo);
             }
@@ -3251,7 +3251,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         String content = "New numbering implemented, please note update status of alternate numbering " + StringUtils.join(serialNumberList, ",");
         String contentInfo = "New numbering implemented, please note update status of alternate numbering " + sbStr;
         //封装消息的实体类
-        SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
+        SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.READ.getValue());
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
         sendWebsocket(StringUtils.join(serialNumberListTemp, ","), contentInfo);
         //飞书
@@ -3274,13 +3274,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
 
     @NotNull
-    public SysAnnouncement getSysAnnouncement(List<String> userIdList, String content, String contentInfo) {
+    public SysAnnouncement getSysAnnouncement(List<String> userIdList, String content, String contentInfo,String messageType) {
         SysAnnouncement sysAnnouncement = new SysAnnouncement();
         sysAnnouncement.setDelFlag("0");
         sysAnnouncement.setSendStatus("0");
         sysAnnouncement.setSendTime(new Date());
 //            sysAnnouncement.setDocumentId((String) dataList.get(0).get("id"));
-        sysAnnouncement.setMsgCategory(MessageTypeEnum.READ.getValue());//消息类型
+        sysAnnouncement.setMsgCategory(messageType);//消息类型
         sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户
         sysAnnouncement.setMsgContent(content);
         sysAnnouncement.setMsgContentInfo(contentInfo);
@@ -4740,7 +4740,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         String content = sysUser.getUsername() + " pushed " + StringUtils.join(serialNumberList, ",") + " to you. Please be reminded to check it out.";
         String contentInfo = sysUser.getUsername() + " pushed " + StringUtils.join(hrefList, ",") + " to you. Please be reminded to check it out.";
         //封装消息的实体类
-        SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
+        SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.PUSH.getValue());
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
         sendWebsocket(StringUtils.join(thirdIdList, ","), contentInfo);
         //飞书

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java

@@ -1147,7 +1147,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     contentInfo = setContentInfo(contentInfo, baseDiff,contentLog);
                     contentInfoTemp = setContentInfo(contentInfoTemp, baseDiff,contentLog).replace("</br>"," ");
                     //封装消息的实体类
-                    SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
+                    SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.READ.getValue());
                     sysAnnouncementService.saveAnnouncement(sysAnnouncement);
                     bussDocumentLibraryEOService.sendWebsocket(idTemp, contentInfo);
                     //飞书
@@ -1161,7 +1161,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     contentInfo = "Please note that the "+baseName+" virtual list you subscribed to has been withdrawn.";
 
                     //封装消息的实体类
-                    SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
+                    SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.READ.getValue());
                     sysAnnouncementService.saveAnnouncement(sysAnnouncement);
                     bussDocumentLibraryEOService.sendWebsocket(idTemp, contentInfo);
                     //飞书

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java

@@ -333,7 +333,7 @@ public class LawsWarnService {
         String content = sysUser.getUsername() + " pushed " + StringUtils.join(serialNumberList, ",") + " to you. Please be reminded to check it out.";
         String contentInfo = sysUser.getUsername() + " pushed " + StringUtils.join(hrefList, ",") + " to you. Please be reminded to check it out.";
         //封装消息的实体类
-        SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
+        SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.PUSH.getValue());
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
         bussDocumentLibraryEOService.sendWebsocket(StringUtils.join(thirdIdList, ","), contentInfo);
         //飞书

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java

@@ -150,7 +150,7 @@ public class TimedTaskWarn implements Job {
     private void sendMessage(String content,String contentInfo,String contentFeiShu, String url, List<String> userIdList, List<String> thirdIdList) {
         //站内消息
         //封装消息的实体类
-        SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
+        SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.WARN.getValue());
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
         bussDocumentLibraryEOService.sendWebsocket(StringUtils.join(userIdList, ","), content);
 

jero-web/src/views/processCenter/components/standardContentList.vue

@@ -137,36 +137,42 @@
     },
     mounted() {
       this.dataSource = []
-      this.dataSource.push({
+      if (this.standardContentListQuery.designDeliverableTypeName){
-        ProcessType: this.$t('designComplianceReview'),
+        this.dataSource.push({
-        InitiatorName: this.standardContentListQuery.designInitiatorName,
+          ProcessType: this.$t('designComplianceReview'),
-        DutyName: this.standardContentListQuery.designDutyName,
+          InitiatorName: this.standardContentListQuery.designInitiatorName,
-        DueDate: this.standardContentListQuery.designDueDate,
+          DutyName: this.standardContentListQuery.designDutyName,
-        DeliverableType: this.standardContentListQuery.designDeliverableTypeName,
+          DueDate: this.standardContentListQuery.designDueDate,
-        DeliverableTemplate: this.standardContentListQuery.designDeliverableTemplate,
+          DeliverableType: this.standardContentListQuery.designDeliverableTypeName,
-        DeliverableTemplateName: this.standardContentListQuery.designDeliverableTemplateName,
+          DeliverableTemplate: this.standardContentListQuery.designDeliverableTemplate,
-        remark: this.standardContentListQuery.designRemark
+          DeliverableTemplateName: this.standardContentListQuery.designDeliverableTemplateName,
-      })
+          remark: this.standardContentListQuery.designRemark
-      this.dataSource.push({
+        })
-        ProcessType: this.$t('preHomeConfirmation'),
+      }
-        InitiatorName: this.standardContentListQuery.prehomoInitiatorName,
+      if (this.standardContentListQuery.prehomoDeliverableTypeName){
-        DutyName: this.standardContentListQuery.prehomoDutyName,
+        this.dataSource.push({
-        DueDate: this.standardContentListQuery.prehomoDueDate,
+          ProcessType: this.$t('preHomeConfirmation'),
-        DeliverableType: this.standardContentListQuery.prehomoDeliverableTypeName,
+          InitiatorName: this.standardContentListQuery.prehomoInitiatorName,
-        DeliverableTemplate: this.standardContentListQuery.prehomoDeliverableTemplate,
+          DutyName: this.standardContentListQuery.prehomoDutyName,
-        DeliverableTemplateName: this.standardContentListQuery.prehomoDeliverableTemplateName,
+          DueDate: this.standardContentListQuery.prehomoDueDate,
-        remark: this.standardContentListQuery.prehomoRemark
+          DeliverableType: this.standardContentListQuery.prehomoDeliverableTypeName,
-      })
+          DeliverableTemplate: this.standardContentListQuery.prehomoDeliverableTemplate,
-      this.dataSource.push({
+          DeliverableTemplateName: this.standardContentListQuery.prehomoDeliverableTemplateName,
-        ProcessType: this.$t('verificationComplianceReview'),
+          remark: this.standardContentListQuery.prehomoRemark
-        InitiatorName: this.standardContentListQuery.verifyInitiatorName,
+        })
-        DutyName: this.standardContentListQuery.verifyDutyName,
+      }
-        DueDate: this.standardContentListQuery.verifyDueDate,
+      if (this.standardContentListQuery.verifyDeliverableTypeName){
-        DeliverableType: this.standardContentListQuery.verifyDeliverableTypeName,
+        this.dataSource.push({
-        DeliverableTemplate: this.standardContentListQuery.verifyDeliverableTemplate,
+          ProcessType: this.$t('verificationComplianceReview'),
-        DeliverableTemplateName: this.standardContentListQuery.verifyDeliverableTemplateName,
+          InitiatorName: this.standardContentListQuery.verifyInitiatorName,
-        remark: this.standardContentListQuery.verifyRemark
+          DutyName: this.standardContentListQuery.verifyDutyName,
-      })
+          DueDate: this.standardContentListQuery.verifyDueDate,
+          DeliverableType: this.standardContentListQuery.verifyDeliverableTypeName,
+          DeliverableTemplate: this.standardContentListQuery.verifyDeliverableTemplate,
+          DeliverableTemplateName: this.standardContentListQuery.verifyDeliverableTemplateName,
+          remark: this.standardContentListQuery.verifyRemark
+        })
+      }
     },
     methods: {
       ...mapGetters(['userInfo']),

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -1355,27 +1355,50 @@
           let isTrue = true
           this.detailedSuccessList = []
           this.detailedWarningList = []
+          let dataSource = []
           for (let i = 0; i < this.dataSource.length; i++) {
             for (let j = 0; j < selectedRowKeys.length; j++) {
               if (this.dataSource[i].id == selectedRowKeys[j]) {
-                if (this.dataSource[i].inventoryAffirmStatus == 'Not started' || this.dataSource[i].inventoryAffirmStatus == 'Rejected') {
+                dataSource.push(this.dataSource[i])
-                  if (this.dataSource[i].homologationEngineerId && this.dataSource[i].regulationOwnerId) {
-                    this.detailedSuccessList.push(this.dataSource[i])
-                  } else {
-                    this.detailedWarningList.push( < div > { this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>)
-                    // this.$message.warning(this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification'))
-                    // isTrue = false
-                    // return
-                  }
-                } else {
-                  this.detailedWarningList.push( < div > {this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')} < /div>)
-                  // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected'))
-                  // isTrue = false
-                  // return
-                }
               }
             }
           }
+          for (let i = 0; i < dataSource.length; i++) {
+            if (dataSource[i].inventoryAffirmStatus == 'Not started' || dataSource[i].inventoryAffirmStatus == 'Rejected') {
+              if (dataSource[i].homologationEngineerId && dataSource[i].regulationOwnerId) {
+                if (dataSource[i].designDeliverableType){
+                      if (!dataSource[i].designInitiatorId){
+                        this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ','+this.$t('designComplianceReview')+ this.$t('Sponsor')+this.$t('cannotEmpty') } < /div>)
+                        continue
+                      }
+                }
+                if (dataSource[i].prehomoDeliverableType){
+                  if (!dataSource[i].prehomoInitiatorId){
+                    this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ','+this.$t('preHomeConfirmation')+ this.$t('Sponsor')+this.$t('cannotEmpty') } < /div>)
+                    continue
+                  }
+                }
+                if (dataSource[i].verifyDeliverableType){
+                  if (!dataSource[i].verifyInitiatorId){
+                    this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ','+this.$t('verificationComplianceReview')+ this.$t('Sponsor')+this.$t('cannotEmpty') } < /div>)
+                    continue
+                  }
+                }
+                 this.detailedSuccessList.push(dataSource[i])
+
+              } else {
+                this.detailedWarningList.push( < div > { dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>)
+                // this.$message.warning(this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification'))
+                // isTrue = false
+                // return
+              }
+            } else {
+              this.detailedWarningList.push( < div > {dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')} < /div>)
+              // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected'))
+              // isTrue = false
+              // return
+            }
+          }
           if (this.detailedSuccessList && this.detailedSuccessList.length > 0) {
             this.visible = true
             this.formInline = {}
@@ -1592,31 +1615,35 @@
 
       getRowKeys(value, callBack) {
         let isTrue = true
+        let dataSource = []
         for (let i = 0; i < this.dataSource.length; i++) {
           for (let j = 0; j < value.length; j++) {
             if (this.dataSource[i].id == value[j]) {
-              if (this.dataSource[i].inventoryAffirmStatus == 'List to confirm') {
+              dataSource.push(this.dataSource[i])
-                if (this.dataSource[i].roleCode == 1 && this.dataSource[i].regulationOwnerSubmitStatus) {
-                  isTrue = false
-                  this.$message.warning(this.$t('The') + (i + 1) + this.$t('submitted'))
-                  return
-                } else if (this.dataSource[i].roleCode == 2 && this.dataSource[i].homologationEngineerSubmitStatus) {
-                  isTrue = false
-                  this.$message.warning(this.$t('The') + (i + 1) + this.$t('submitted'))
-                  return
-                } else if (this.dataSource[i].roleCode == 4 && (this.dataSource[i].homologationEngineerSubmitStatus && this.dataSource[i].regulationOwnerSubmitStatus)) {
-                  isTrue = false
-                  this.$message.warning(this.$t('The') + (i + 1) + this.$t('submitted'))
-                  return
-                }
-              } else {
-                isTrue = false
-                this.$message.warning(this.$t('The') + (i + 1) + this.$t('incorrectsubmitted'))
-                return
-              }
             }
           }
         }
+        for (let i = 0; i < dataSource.length; i++) {
+          if (dataSource[i].inventoryAffirmStatus == 'List to confirm') {
+            if (dataSource[i].roleCode == 1 && dataSource[i].regulationOwnerSubmitStatus) {
+              isTrue = false
+              this.$message.warning(this.$t('The') + (i + 1) + this.$t('submitted'))
+              return
+            } else if (dataSource[i].roleCode == 2 && dataSource[i].homologationEngineerSubmitStatus) {
+              isTrue = false
+              this.$message.warning(this.$t('The') + (i + 1) + this.$t('submitted'))
+              return
+            } else if (dataSource[i].roleCode == 4 && (dataSource[i].homologationEngineerSubmitStatus && dataSource[i].regulationOwnerSubmitStatus)) {
+              isTrue = false
+              this.$message.warning(this.$t('The') + (i + 1) + this.$t('submitted'))
+              return
+            }
+          } else {
+            isTrue = false
+            this.$message.warning(this.$t('The') + (i + 1) + this.$t('incorrectsubmitted'))
+            return
+          }
+        }
         if (isTrue) {
           callBack()
         }