修改认证清单和市场认证清单 添加备注列

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java

@@ -161,4 +161,9 @@ public class AuthDummyInventoryInfoEO implements Serializable {
     /**认证类型*/
     @ApiModelProperty(value = "认证类型")
     private String attestationType;
+
+    /**备注*/
+    @ApiModelProperty(value = "备注")
+    @Excel(name = "备注", width = 50)
+    private String remark;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java

@@ -961,9 +961,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 		if(CollectionUtils.isNotEmpty(baseList)){
 			String title = "";
 			if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
-				title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID,*编号,*责任领域,*交付物类型,交付物模板";
+				title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID,*编号,*责任领域,*交付物类型,交付物模板,备注";
 			}else{
-				title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID,*Number,*Responsible Field,*Deliverable Type,Deliverable Template";
+				title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID,*Number,*Responsible Field,*Deliverable Type,Deliverable Template,Remark";
 			}
 
 			int pos = file.getOriginalFilename().lastIndexOf(".");
@@ -1081,7 +1081,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 									if (i == 0) {
 										cell.setCellType(HSSFCell.CELL_TYPE_STRING);
 										headerSb.append(cell.getStringCellValue() + ",");
-										if(j == 8){
+										if(j == 9){
 											break;
 										}
 									} else if(i > 1){
@@ -1623,8 +1623,10 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 		}else{
 			for (AuthDummyInventoryInfoEO authDummyInventoryInfoEO : datas) {
 				List<BussDocumentLibraryEO> collect = bussDocumentLibraryEOList.stream()
-						.filter(e -> e.getSerialNumber().equals(authDummyInventoryInfoEO.getSerialNumber())).collect(Collectors.toList());
+						.filter(e -> e.getSerialNumber().trim().equals(authDummyInventoryInfoEO.getSerialNumber().trim())).collect(Collectors.toList());
-				authDummyInventoryInfoEO.setBussDocumentLibraryId(collect.get(0).getId());
+				if(CollectionUtils.isNotEmpty(collect)){
+					authDummyInventoryInfoEO.setBussDocumentLibraryId(collect.get(0).getId());
+				}
 			}
 		}
 //		//2. 验证标准号在法规清单中是否添加过
@@ -1705,6 +1707,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 			case "*责任领域": return "dutyTerritoryName";
 			case "交付物模板": return "deliverableTemplateName";
 			case "*交付物类型" : return "deliverableTypeName";
+			case "备注" : return "remark";
 
 			case "*Category" : return  "Category";
 			case "*Inspection Items" : return"inspectionItem";
@@ -1715,6 +1718,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 			case "*Responsible Field" : return "dutyTerritoryName";
 			case "Deliverable Template" : return "deliverableTemplateName";
 			case "*Deliverable Type" : return "deliverableTypeNameEn";
+			case "Remark" : return "remark";
 
 
 			default: return null;
@@ -1797,17 +1801,17 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 			String title = "";
 			if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
 				title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," +
-						"*编号,*责任领域,*交付物类型,交付物模板,";
+						"*编号,*责任领域,*交付物类型,交付物模板,备注,";
 			}else{
 				title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," +
-						"*Number,*Responsible Field,*Deliverable Type,Deliverable Template,";
+						"*Number,*Responsible Field,*Deliverable Type,Deliverable Template,Remark,";
 			}
 			List<String> list = Arrays.asList(title.split(","));
 			int index = 0;
 			if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
-				index = list.indexOf("交付物模板") + 1;
+				index = list.indexOf("备注") + 1;
 			}else{
-				index = list.indexOf("Deliverable Template") + 1;
+				index = list.indexOf("Remark") + 1;
 			}
 
 			//创建临时文件夹

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java

@@ -256,6 +256,11 @@ public class ProjectCertificationInventoryEO implements Serializable {
     @ApiModelProperty(value = "认证类型")
     private String attestationType;
 
+    /**备注*/
+    @ApiModelProperty(value = "备注")
+    @Excel(name = "备注", width = 50)
+    private String remark;
+
     /**一级责任领域**/
     @TableField(exist = false)
     private String firstLevelDutyTerritory;

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

@@ -4459,11 +4459,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
 			title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," +
 					"*标准编号,*责任领域,*工程接口人,*责任人," +
-					"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
+					"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称,备注";
 		}else {
 			title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," +
 					"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
-					"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
+					"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer,Remark";
 		}
 
 		int pos = file.getOriginalFilename().lastIndexOf(".");
@@ -4579,7 +4579,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 								if (i == 0) {
 									cell.setCellType(HSSFCell.CELL_TYPE_STRING);
 									headerSb.append(cell.getStringCellValue() + ",");
-									if(j == 15){
+									if(j == 16){
 										break;
 									}
 								} else if(i > 1){
@@ -4817,6 +4817,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 			// 认证类型
 			String attestationTypeName = projectCertificationInventoryEO.getAttestationTypeName();
+			// 备注
+			String remark = projectCertificationInventoryEO.getRemark();
 
 
 
@@ -4989,6 +4991,18 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				}
 			}
 
+			if(StringUtils.isNotBlank(remark)){
+				if(remark.length() > 500){
+					String message = "";
+					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
+						message = errorMsg + "备注不能超过500个字符";
+					}else{
+						message = errorMsg + " The Remark cannot contain more than 200 characters";
+					}
+					msgList.add(message);
+				}
+			}
+
 		}
 		return msgList;
 	}
@@ -5659,6 +5673,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			case "产品型号": return "productModel";
 			case "生产企业名称": return "productionEnterpriseName";
 			case "认证进度": return "certificationProgress";
+			case "备注": return "remark";
 
 			case "*Category": return "category";
 			case "*Inspection Items": return "inspectionItem";
@@ -5678,6 +5693,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			case "Product Model": return "productModel";
 			case "Name Of Manufacturer": return "productionEnterpriseName";
 			case "Homologation Progress": return "certificationProgress";
+			case "Remark": return "remark";
 
 			default: return null;
 			//"Deliverable Type,Deliverable Template,initiator,Assignee,Due Date," +
@@ -5702,19 +5718,19 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
 				title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," +
 						"*标准编号,*责任领域,*工程接口人,*责任人," +
-						"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
+						"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称,备注";
 			}else {
 				title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," +
 						"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
-						"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
+						"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer,Remark";
 			}
 
 			List<String> list = Arrays.asList(title.split(","));
 			int index = 0;
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-				index = list.indexOf("生产企业名称") + 1;
+				index = list.indexOf("备注") + 1;
 			}else{
-				index = list.indexOf("Name Of Manufacturer") + 1;
+				index = list.indexOf("Remark") + 1;
 			}
 
 			//创建临时文件夹

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

@@ -321,7 +321,24 @@
                   </div>
                 </a-col>
               </a-row>
-
+              <a-row :gutter="24">
+                <a-col :span="24">
+                  <div class="box-title-text">
+                    <div class="title-text">
+                    <span class="title-text-text"
+                          :title="$t('remarks')">{{$t('remarks')}}</span>
+                    </div>
+                    <a-form-model-item class="itemModel-text" :prop="'dataList.'+index+'.remark'"
+                                       :rules="[{max: 500,message: $t('remarks') + $t('cannotExceed') + 500 + $t('Characters'),trigger: 'blur'
+                            }]">
+                      <a-textarea
+                        style="width: 100%"
+                        :placeholder="$t('PleaseEnter')+$t('remarks')"
+                        v-model="item.remark" :rows="4"/>
+                    </a-form-model-item>
+                  </div>
+                </a-col>
+              </a-row>
               <!--              <a-row :gutter="24">-->
               <!--                <a-col :span="12">-->
               <!--                  <div class="box-title-text">-->
@@ -638,6 +655,22 @@
                 </div>
               </a-col>
             </a-row>
+            <a-row :gutter="24">
+              <a-col :span="24">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="title-text-text"
+                          :title="$t('remarks')">{{$t('remarks')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel-text" :prop="'remark'">
+                    <a-textarea
+                      style="width: 100%"
+                      :placeholder="$t('PleaseEnter')+$t('remarks')"
+                      v-model="formInline.remark" :rows="4"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+            </a-row>
             <a-row :gutter="24">
               <a-col :span="12" v-if="formInline.taskConfirmEndTime">
                 <div class="box-title-text">
@@ -770,7 +803,14 @@
               message: this.$t('configurationItem') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
               trigger: 'blur'
             }
-          ]
+          ],
+          remark:[
+            {
+              max: 500,
+              message: this.$t('remarks') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
         },
         disabled: false,
         flowdisabled: false,
@@ -1258,6 +1298,11 @@
   ::v-deep .ant-form-item-with-help {
     margin-bottom: 25px;
   }
+  .itemModel-text {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
 </style>
 <style>
   .ant-input-disabled {

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

@@ -891,6 +891,13 @@
             ellipsis: true,
             scopedSlots: { customRender: 'CertificationProgress' }
           },
+          {
+            title: this.$t('remarks'),
+            align: 'left',
+            dataIndex: 'remark',
+            width: 210,
+            ellipsis: true,
+          },
           {
             title: this.$t('operation'),
             align: 'left',

jero-web/src/views/virtualAuthenticationList/components/addModel.vue

@@ -226,6 +226,24 @@
                 </div>
               </a-col>
             </a-row>
+            <a-row :gutter="24">
+              <a-col :span="24">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="title-text-text"
+                          :title="$t('remarks')">{{$t('remarks')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel-text" :prop="'dataList.'+index+'.remark'"
+                                     :rules="[{max: 500,message: $t('remarks') + $t('cannotExceed') + 500 + $t('Characters'),trigger: 'blur'
+                            }]">
+                    <a-textarea
+                      style="width: 100%"
+                      :placeholder="$t('PleaseEnter')+$t('remarks')"
+                      v-model="item.remark" :rows="4"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+            </a-row>
           </div>
         </a-form-model>
       </a-spin>
@@ -548,4 +566,10 @@
   ::v-deep .ant-form-item-with-help {
     margin-bottom: 25px;
   }
+
+  .itemModel-text {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
 </style>

jero-web/src/views/virtualAuthenticationList/components/editModel.vue

@@ -222,6 +222,22 @@
               </div>
             </a-col>
           </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                    <span class="title-text-text"
+                          :title="$t('remarks')">{{$t('remarks')}}</span>
+                </div>
+                <a-form-model-item class="itemModel-text" :prop="'remark'">
+                  <a-textarea
+                    style="width: 100%"
+                    :placeholder="$t('PleaseEnter')+$t('remarks')"
+                    v-model="formInline.remark" :rows="4"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
         </a-form-model>
       </a-spin>
       <div class="drawer-bootom-button" v-if="button">
@@ -325,7 +341,14 @@
               message: this.$t('Deliverables') + this.$t('cannotEmpty'),
               trigger: 'change'
             }
-          ]
+          ],
+          remark:[
+            {
+              max: 500,
+              message: this.$t('remarks') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
         }
       }
     },
@@ -560,4 +583,10 @@
   ::v-deep .ant-form-item-with-help {
     margin-bottom: 25px;
   }
+
+  .itemModel-text {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
 </style>

jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue

@@ -429,6 +429,13 @@
             ellipsis: true,
             scopedSlots: { customRender: 'deliverableTemplate' }
           },
+          {
+            title: this.$t('remarks'),
+            align: 'left',
+            dataIndex: 'remark',
+            width: 330,
+            ellipsis: true
+          },
           {
             title: this.$t('operation'),
             align: 'left',