Merge remote-tracking branch 'origin/dev_20230912_Platform' into fix_20230911_UAT

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml

@@ -31,6 +31,8 @@
             pni.project_name,
             plb.target_market,
             plb.project_version,
+            plb.project_name_id,
+            plb.platform,
             pyni.year_name,
             pli.serial_number,
             pli.title,
@@ -62,7 +64,7 @@
         LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id
         LEFT JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id
         where
-        plb.platform is null
+        1=1
         <!--<if test="ncrTrackVO.projectLibraryId != null and ncrTrackVO.projectLibraryId != ''">
             plb.id =#{ncrTrackVO.projectLibraryId}
             and

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java

@@ -192,11 +192,16 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
             String yearName = trackVO.getYearName();
             String market = getMarket(targetMarketList, trackVO,ncrTrackVO.getCut());
             String projectVersion = trackVO.getProjectVersion();
-            if(StringUtils.isNotBlank(projectVersion)){
+            if(StringUtils.isNotBlank(trackVO.getPlatform())){
-                trackVO.setProjectName(projectName+"-"+yearName+"-"+market+"-"+projectVersion);
+                trackVO.setProjectName(trackVO.getProjectNameId());
             }else{
-                trackVO.setProjectName(projectName+"-"+yearName+"-"+market);
+                if(StringUtils.isNotBlank(projectVersion)){
+                    trackVO.setProjectName(projectName+"-"+yearName+"-"+market+"-"+projectVersion);
+                }else{
+                    trackVO.setProjectName(projectName+"-"+yearName+"-"+market);
+                }
             }
+
             //责任领域中英文切换
             if(StringUtils.isNotBlank(trackVO.getDutyTerritory())){
                 String dutyTerritory = pull(dictItemList, trackVO.getDutyTerritory(), "duty_territory", ncrTrackVO.getCut());
@@ -784,10 +789,12 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
     private String getMarket(List<DictModel> targetMarketList, NcrTrackVO trackVO,String cut) {
         //目标市场
         List<DictModel> dictModelList = new ArrayList<>();
-        for (String s : trackVO.getTargetMarket().split(",")) {
+        if(StringUtils.isNotBlank(trackVO.getTargetMarket())){
-            List<DictModel> dictModelListTemp = targetMarketList.stream()
+            for (String s : trackVO.getTargetMarket().split(",")) {
-                    .filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
+                List<DictModel> dictModelListTemp = targetMarketList.stream()
-            dictModelList.addAll(dictModelListTemp);
+                        .filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
+                dictModelList.addAll(dictModelListTemp);
+            }
         }
         String targetMarket = "";
         if(dictModelList.size() != 0){

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java

@@ -247,6 +247,10 @@ public class NcrTrackVO implements Serializable {
     @ApiModelProperty(value = "旧数据->old,新数据->new")
     private String flag;
 
+    private String projectNameId;
+
+    private String platform;
+
 
 
 

jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue

@@ -868,6 +868,7 @@
         this.formInline = {}
         this.dutyTerritoryList = []
         this.visible = true
+        this.flowdisabled = false
         this.personnelVisible = true
         value.dutyDepart = value.dutyDepart ? value.dutyDepart.split(',') : []
         value.dutyTerritory = value.dutyTerritory ? value.dutyTerritory.split(',') : []

jero-web/src/views/projectManagement/components/certificationList/index.vue

@@ -1207,7 +1207,12 @@
           for (let i = 0; i < this.selectedRowKeysList.length; i++) {
             if (this.selectedRowKeysList[i].flowStatus == 'List to be released' ||
               this.selectedRowKeysList[i].flowStatus == 'Review and pass') {
-              ids.push(this.selectedRowKeysList[i].id)
+              if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
+                this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
+                return
+              }else{
+                ids.push(this.selectedRowKeysList[i].id)
+              }
             } else {
               notConditions.push(this.selectedRowKeysList[i].inspectionItem)
             }
@@ -1707,19 +1712,24 @@
       deleteLib(val) {
         let _this = this
         if (val.flowStatus == 'List to be released' || val.flowStatus == 'Review and pass') {
-          this.$confirm({
+          console.log(val)
-            content: _this.$t('ConfirmDelete'),
+          if(val.projectCertificationInventoryEOS && (val.projectCertificationInventoryEOS.length > 0 || val.projectCertificationInventoryEOS !== null)){
-            onOk() {
+            this.$message.warning(val.serialNumber + this.$t('platformitemhasbeenassociated'))
-              deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => {
+          }else{
-                if (res.success) {
+            this.$confirm({
-                  _this.$message.success(_this.$t('OperationSuccessful'))
+              content: _this.$t('ConfirmDelete'),
-                  _this.getList()
+              onOk() {
-                } else {
+                deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => {
-                  _this.$message.warning(_this.$t('operationFailed'))
+                  if (res.success) {
-                }
+                    _this.$message.success(_this.$t('OperationSuccessful'))
-              })
+                    _this.getList()
-            }
+                  } else {
-          })
+                    _this.$message.warning(_this.$t('operationFailed'))
+                  }
+                })
+              }
+            })
+          }
         } else {
           this.$message.warning(this.$t('onlyDataWithProcessStatusDeleted'))
         }

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

@@ -242,7 +242,7 @@
                 <span class="title-text-text"
                       :title="$t('personLiable')">{{$t('personLiable')}}</span>
               </div>
-              <a-form-model-item class="itemModel-multi"
+              <a-form-model-item class="itemModel"
                                  :prop="formInline.designDeliverableType.join(',').includes('1645667531513237506')?'':'designDutyIdName'"
                                  :rules="[{ required: formInline.designDeliverableType.join(',').includes('1645667531513237506')?false:true,
                                  message: $t('personLiable') + $t('cannotEmpty'), trigger: 'change'}]">
@@ -373,7 +373,7 @@
                 <span class="title-text-text"
                       :title="$t('personLiable')">{{$t('personLiable')}}</span>
               </div>
-              <a-form-model-item class="itemModel-multi"
+              <a-form-model-item class="itemModel"
                                  :prop="formInline.verifyDeliverableType.join(',').includes('1645667531513237506')?'':'verifyDutyIdName'"
                                  :rules="[{ required: formInline.verifyDeliverableType.join(',').includes('1645667531513237506')?false:true,
                                  message: $t('personLiable') + $t('cannotEmpty'), trigger: 'change'}]">
@@ -1332,6 +1332,7 @@
 
   .formAdd {
     margin-bottom: 40px;
+
   }
 
   .button-text {

jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue

@@ -318,6 +318,7 @@
             projectName: row.projectName,
             targetMarket: row.targetMarket,
             projectNameId: row.projectNameId,
+            platform:row.platform,
             primaryKeyId: row.primaryKeyId,
             PersonChargeFeedback: row.personChargeFeedback
           }
@@ -376,6 +377,7 @@
           query = {
             router: row.router,
             taskIds: row.taskId,
+            platform:row.platform,
             actiProcInstId: row.actiProcInstId,
             id: row.projectLibraryId,
             projectLibraryId: row.projectLibraryId,

jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue

@@ -20,6 +20,7 @@
         :title="$t('basicInformation')"
         :projectInformationList="projectInformationList"
         :url="url"
+        :platform="this.queryData.platform"
         :projectInformationId="this.queryBy.projectLibraryId"
         :queryProject="queryProject"
       />
@@ -294,6 +295,9 @@
         getAction(this.url.queryProjectLawsInventoryInfoById, query).then((res) => {
           if (res.success) {
             this.queryProject = res.result[0] || {}
+            if(this.queryData.platform){
+              this.queryProject.platform = this.queryData.platform
+            }
             // if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr') {
             //   this.queryProject.endTime = this.queryData.endTime
             // }

jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue

@@ -55,6 +55,10 @@
         type: String,
         default: ''
       },
+      platform: {
+        type: String,
+        default: ''
+      },
       queryProject: {
         type: Object,
         default: {}
@@ -101,17 +105,32 @@
       },
 
       RelatedItemsClick(item) {
-        let newUrl = this.$router.resolve({
+        if(this.platform == 'YES'){
-          path: '/ProjectDetails',
+          let newUrl = this.$router.resolve({
-          query: {
+            path: '/platformItemLibraryDetails',
-            id: item.projectLibraryId,
+            query: {
-            projectName: item.projectName+'-'+item.projectVersion,
+              id: item.id,
-            projectNameId: item.projectNameId,
+              projectName: item.projectName+'-'+item.projectVersion,
-            targetMarket: item.targetMarket,
+              projectNameId: item.projectName,
-            studioEngineer: item.studioEngineer
+              targetMarket: item.targetMarket,
-          }
+              studioEngineer: item.studioEngineer
-        })
+            }
-        window.open(newUrl.href, '_blank')
+          })
+          window.open(newUrl.href, '_blank')
+        }else{
+          let newUrl = this.$router.resolve({
+            path: '/ProjectDetails',
+            query: {
+              id: item.projectLibraryId,
+              projectName: item.projectName+'-'+item.projectVersion,
+              projectNameId: item.projectNameId,
+              targetMarket: item.targetMarket,
+              studioEngineer: item.studioEngineer
+            }
+          })
+          window.open(newUrl.href, '_blank')
+        }
+
       },
     }
   }